From 470823d9dd6cf7728e04ec9c121fb375cdb9e369 Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Tue, 13 Oct 2020 12:45:50 +0530
Subject: [PATCH 001/184] Onboarded Asset V4 Apis

---
 ansible/roles/kong-api/defaults/main.yml | 108 +++++++++++++++++++++++
 1 file changed, 108 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 0daa1bbbb..0bf47f3e9 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -5257,3 +5257,111 @@ kong_apis:
       config.limit_by: credential
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
+
+  - name: createAsset
+      uris: "{{ asset_prefix }}/v1/create"
+      upstream_url: "{{ content_service_url }}/asset/v4/create"
+      strip_uri: true
+      plugins:
+        - name: jwt
+        - name: cors
+        - "{{ statsd_pulgin }}"
+        - name: acl
+          config.whitelist:
+            - 'contentCreate'
+        - name: rate-limiting
+          config.policy: local
+          config.hour: "{{ medium_rate_limit_per_hour }}"
+          config.limit_by: credential
+        - name: request-size-limiting
+          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: updateAsset
+      uris: "{{ asset_prefix }}/v1/update"
+      upstream_url: "{{ content_service_url }}/asset/v4/update"
+      strip_uri: true
+      plugins:
+        - name: jwt
+        - name: cors
+        - "{{ statsd_pulgin }}"
+        - name: acl
+          config.whitelist:
+            - 'contentCreate'
+        - name: rate-limiting
+          config.policy: local
+          config.hour: "{{ medium_rate_limit_per_hour }}"
+          config.limit_by: credential
+        - name: request-size-limiting
+          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: readAsset
+      uris: "{{ asset_prefix }}/v1/read"
+      upstream_url: "{{ content_service_url }}/asset/v4/read"
+      strip_uri: true
+      plugins:
+        - name: jwt
+        - name: cors
+        - "{{ statsd_pulgin }}"
+        - name: acl
+          config.whitelist:
+            - 'contentCreate'
+        - name: rate-limiting
+          config.policy: local
+          config.hour: "{{ medium_rate_limit_per_hour }}"
+          config.limit_by: credential
+        - name: request-size-limiting
+          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: uploadAsset
+      uris: "{{ asset_prefix }}/v1/upload"
+      upstream_url: "{{ content_service_url }}/asset/v4/upload"
+      strip_uri: true
+      plugins:
+        - name: jwt
+        - name: cors
+        - "{{ statsd_pulgin }}"
+        - name: acl
+          config.whitelist:
+            - 'contentCreate'
+        - name: rate-limiting
+          config.policy: local
+          config.hour: "{{ medium_rate_limit_per_hour }}"
+          config.limit_by: credential
+        - name: request-size-limiting
+          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: uploadUrlAsset
+      uris: "{{ asset_prefix }}/v1/upload/url"
+      upstream_url: "{{ content_service_url }}/asset/v4/upload/url"
+      strip_uri: true
+      plugins:
+        - name: jwt
+        - name: cors
+        - "{{ statsd_pulgin }}"
+        - name: acl
+          config.whitelist:
+            - 'contentCreate'
+        - name: rate-limiting
+          config.policy: local
+          config.hour: "{{ medium_rate_limit_per_hour }}"
+          config.limit_by: credential
+        - name: request-size-limiting
+          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: retireAsset
+      uris: "{{ asset_prefix }}/v1/retire"
+      upstream_url: "{{ content_service_url }}/asset/v4/retire"
+      strip_uri: true
+      plugins:
+        - name: jwt
+        - name: cors
+        - "{{ statsd_pulgin }}"
+        - name: acl
+          config.whitelist:
+            - 'contentCreate'
+        - name: rate-limiting
+          config.policy: local
+          config.hour: "{{ medium_rate_limit_per_hour }}"
+          config.limit_by: credential
+        - name: request-size-limiting
+          config.allowed_payload_size: "{{ medium_request_size_limit }}"

From 10827f1b01735bd7493c0ea3a6ea2f30183a1176 Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Tue, 13 Oct 2020 13:17:50 +0530
Subject: [PATCH 002/184] Added changes for asset prefix

---
 ansible/roles/kong-api/defaults/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 0bf47f3e9..bdf576b2d 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -75,6 +75,8 @@ auth_service_prefix: /auth
 object_category_prefix: /object/category
 object_category_definition_prefix: /object/category/definition
 dataset_service_prefix: /dataset
+asset_prefix: /asset
+
 
 # Service URLs
 knowledge_mw_service_url: "http://knowledge-mw-service:5000"

From 6768114fd04242a2933ec4f6a4516626f3d7344f Mon Sep 17 00:00:00 2001
From: NehaVerma <neha0305verma@gmail.com>
Date: Tue, 13 Oct 2020 13:34:27 +0530
Subject: [PATCH 003/184] SB-21000 : Certificate Template mapping added

---
 .../stack-sunbird/templates/content-service_application.conf     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index 07dbcb6c0..a96cdc908 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -534,6 +534,7 @@ contentTypeToPrimaryCategory {
   LessonPlanUnit: "Lesson Plan Unit"
   CourseUnit: "Course Unit"
   TextBookUnit: "Textbook Unit"
+  Asset: "Certificate Template"
 }
 
 resourceTypeToPrimaryCategory {

From c7a3fcd7d65defafd4130e6ae4fb203ed9d5f6a8 Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Tue, 13 Oct 2020 14:10:22 +0530
Subject: [PATCH 004/184] Added fix for indentation issue

---
 ansible/roles/kong-api/defaults/main.yml | 192 +++++++++++------------
 1 file changed, 96 insertions(+), 96 deletions(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index bdf576b2d..7fccebf6f 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -5261,109 +5261,109 @@ kong_apis:
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
   - name: createAsset
-      uris: "{{ asset_prefix }}/v1/create"
-      upstream_url: "{{ content_service_url }}/asset/v4/create"
-      strip_uri: true
-      plugins:
-        - name: jwt
-        - name: cors
-        - "{{ statsd_pulgin }}"
-        - name: acl
-          config.whitelist:
-            - 'contentCreate'
-        - name: rate-limiting
-          config.policy: local
-          config.hour: "{{ medium_rate_limit_per_hour }}"
-          config.limit_by: credential
-        - name: request-size-limiting
-          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+    uris: "{{ asset_prefix }}/v1/create"
+    upstream_url: "{{ content_service_url }}/asset/v4/create"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
   - name: updateAsset
-      uris: "{{ asset_prefix }}/v1/update"
-      upstream_url: "{{ content_service_url }}/asset/v4/update"
-      strip_uri: true
-      plugins:
-        - name: jwt
-        - name: cors
-        - "{{ statsd_pulgin }}"
-        - name: acl
-          config.whitelist:
-            - 'contentCreate'
-        - name: rate-limiting
-          config.policy: local
-          config.hour: "{{ medium_rate_limit_per_hour }}"
-          config.limit_by: credential
-        - name: request-size-limiting
-          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+    uris: "{{ asset_prefix }}/v1/update"
+    upstream_url: "{{ content_service_url }}/asset/v4/update"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
   - name: readAsset
-      uris: "{{ asset_prefix }}/v1/read"
-      upstream_url: "{{ content_service_url }}/asset/v4/read"
-      strip_uri: true
-      plugins:
-        - name: jwt
-        - name: cors
-        - "{{ statsd_pulgin }}"
-        - name: acl
-          config.whitelist:
-            - 'contentCreate'
-        - name: rate-limiting
-          config.policy: local
-          config.hour: "{{ medium_rate_limit_per_hour }}"
-          config.limit_by: credential
-        - name: request-size-limiting
-          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+    uris: "{{ asset_prefix }}/v1/read"
+    upstream_url: "{{ content_service_url }}/asset/v4/read"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
   - name: uploadAsset
-      uris: "{{ asset_prefix }}/v1/upload"
-      upstream_url: "{{ content_service_url }}/asset/v4/upload"
-      strip_uri: true
-      plugins:
-        - name: jwt
-        - name: cors
-        - "{{ statsd_pulgin }}"
-        - name: acl
-          config.whitelist:
-            - 'contentCreate'
-        - name: rate-limiting
-          config.policy: local
-          config.hour: "{{ medium_rate_limit_per_hour }}"
-          config.limit_by: credential
-        - name: request-size-limiting
-          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+    uris: "{{ asset_prefix }}/v1/upload"
+    upstream_url: "{{ content_service_url }}/asset/v4/upload"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
   - name: uploadUrlAsset
-      uris: "{{ asset_prefix }}/v1/upload/url"
-      upstream_url: "{{ content_service_url }}/asset/v4/upload/url"
-      strip_uri: true
-      plugins:
-        - name: jwt
-        - name: cors
-        - "{{ statsd_pulgin }}"
-        - name: acl
-          config.whitelist:
-            - 'contentCreate'
-        - name: rate-limiting
-          config.policy: local
-          config.hour: "{{ medium_rate_limit_per_hour }}"
-          config.limit_by: credential
-        - name: request-size-limiting
-          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+    uris: "{{ asset_prefix }}/v1/upload/url"
+    upstream_url: "{{ content_service_url }}/asset/v4/upload/url"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
   - name: retireAsset
-      uris: "{{ asset_prefix }}/v1/retire"
-      upstream_url: "{{ content_service_url }}/asset/v4/retire"
-      strip_uri: true
-      plugins:
-        - name: jwt
-        - name: cors
-        - "{{ statsd_pulgin }}"
-        - name: acl
-          config.whitelist:
-            - 'contentCreate'
-        - name: rate-limiting
-          config.policy: local
-          config.hour: "{{ medium_rate_limit_per_hour }}"
-          config.limit_by: credential
-        - name: request-size-limiting
-          config.allowed_payload_size: "{{ medium_request_size_limit }}"
+    uris: "{{ asset_prefix }}/v1/retire"
+    upstream_url: "{{ content_service_url }}/asset/v4/retire"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"

From 74c5b2c49013106026ed19f5b96e440751a0a2c6 Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Tue, 13 Oct 2020 16:59:14 +0530
Subject: [PATCH 005/184] Added collection v4 apis

---
 ansible/roles/kong-api/defaults/main.yml | 218 +++++++++++++++++++++++
 1 file changed, 218 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 7fccebf6f..3e8c2d865 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -76,6 +76,7 @@ object_category_prefix: /object/category
 object_category_definition_prefix: /object/category/definition
 dataset_service_prefix: /dataset
 asset_prefix: /asset
+collection_prefix: /collection
 
 
 # Service URLs
@@ -5367,3 +5368,220 @@ kong_apis:
       config.limit_by: credential
     - name: request-size-limiting
       config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionCreate
+    uris: "{{ collection_prefix }}/v1/create"
+    upstream_url: "{{ content_service_url }}/collection/v4/create"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionRead
+    uris: "{{ collection_prefix }}/v1/read"
+    upstream_url: "{{ content_service_url }}/collection/v4/read"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionUpdate
+    uris: "{{ collection_prefix }}/v1/update"
+    upstream_url: "{{ content_service_url }}/collection/v4/update"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionFlag
+    uris: "{{ collection_prefix }}/v1/flag"
+    upstream_url: "{{ content_service_url }}/collection/v4/flag"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionDiscard
+    uris: "{{ collection_prefix }}/v1/discard"
+    upstream_url: "{{ content_service_url }}/collection/v4/discard"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionRetire
+    uris: "{{ collection_prefix }}/v1/retire"
+    upstream_url: "{{ content_service_url }}/collection/v4/retire"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionHierarchyAdd
+    uris: "{{ collection_prefix }}/v1/hierarchy/add"
+    upstream_url: "{{ content_service_url }}/collection/v4/hierarchy/add"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionHierarchyRemove
+    uris: "{{ collection_prefix }}/v1/hierarchy/remove"
+    upstream_url: "{{ content_service_url }}/collection/v4/hierarchy/remove"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionHierarchyUpdate
+    uris: "{{ collection_prefix }}/v1/hierarchy/update"
+    upstream_url: "{{ content_service_url }}/collection/v4/hierarchy/update"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionHierarchyRead
+    uris: "{{ collection_prefix }}/v1/hierarchy"
+    upstream_url: "{{ content_service_url }}/collection/v4/hierarchy"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+
+  - name: collectionDialcodeLink
+    uris: "{{ collection_prefix }}/v1/dialcode/link"
+    upstream_url: "{{ content_service_url }}/collection/v4/dialcode/link"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+       - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: collectionCopy
+    uris: "{{ collection_prefix }}/v1/copy"
+    upstream_url: "{{ content_service_url }}/collection/v4/copy"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"

From f065ce699b2c8fa003187da6f3a9be947b536ecc Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Tue, 13 Oct 2020 17:29:48 +0530
Subject: [PATCH 006/184] Added content v4 apis

---
 ansible/roles/kong-api/defaults/main.yml | 216 +++++++++++++++++++++++
 1 file changed, 216 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 3e8c2d865..87c65505b 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -5585,3 +5585,219 @@ kong_apis:
       config.limit_by: credential
     - name: request-size-limiting
       config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentCreate
+    uris: "{{ content_prefix }}/v1/create"
+    upstream_url: "{{ content_service_url }}/content/v4/create"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentUpdate
+    uris: "{{ content_prefix }}/v1/update"
+    upstream_url: "{{ content_service_url }}/content/v4/update"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+        config.whitelist:
+          - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentRead
+    uris: "{{ content_prefix }}/v1/read"
+    upstream_url: "{{ content_service_url }}/content/v4/read"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentUpload
+    uris: "{{ content_prefix }}/v1/upload"
+    upstream_url: "{{ content_service_url }}/content/v4/upload"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentUploadUrl
+    uris: "{{ content_prefix }}/v1/upload/url"
+    upstream_url: "{{ content_service_url }}/content/v4/upload/url"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentCopy
+    uris: "{{ content_prefix }}/v1/copy"
+    upstream_url: "{{ content_service_url }}/content/v4/copy"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentDialcodeLink
+    uris: "{{ content_prefix }}/v1/dialcode/link"
+    upstream_url: "{{ content_service_url }}/content/v4/dialcode/link"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentImport
+    uris: "{{ content_prefix }}/v1/import"
+    upstream_url: "{{ content_service_url }}/content/v4/import"
+    strip_uri: true
+    plugins:
+  - name: jwt
+  - name: cors
+  - "{{ statsd_pulgin }}"
+  - name: acl
+    config.whitelist:
+      - 'contentCreate'
+  - name: rate-limiting
+    config.policy: local
+    config.hour: "{{ medium_rate_limit_per_hour }}"
+    config.limit_by: credential
+  - name: request-size-limiting
+    config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentFlag
+    uris: "{{ content_prefix }}/v1/flag"
+    upstream_url: "{{ content_service_url }}/content/v4/flag"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+    config.whitelist:
+      - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentFlagAccept
+    uris: "{{ content_prefix }}/v1/flag/accept"
+    upstream_url: "{{ content_service_url }}/content/v4/flag/accept"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+    config.whitelist:
+      - 'contentCreate'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentDiscard
+    uris: "{{ content_prefix }}/v1/flag/discard"
+    upstream_url: "{{ content_service_url }}/content/v4/flag/discard"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: contentRetire
+    uris: "{{ content_prefix }}/v1/flag/retire"
+    upstream_url: "{{ content_service_url }}/content/v4/flag/retire"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
\ No newline at end of file

From f25f71ab506a0b74d905b8eaab70d5930a5c5544 Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Tue, 13 Oct 2020 17:33:04 +0530
Subject: [PATCH 007/184] Added content v4 apis

---
 ansible/roles/kong-api/defaults/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 87c65505b..5dc98bf3a 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -5613,8 +5613,8 @@ kong_apis:
     - name: cors
     - "{{ statsd_pulgin }}"
     - name: acl
-        config.whitelist:
-          - 'contentCreate'
+      config.whitelist:
+        - 'contentCreate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"

From 22ef32dcaaeb48c870b0db2d19b65e61c0994280 Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Tue, 13 Oct 2020 17:44:38 +0530
Subject: [PATCH 008/184] Added changes to indentation

---
 ansible/roles/kong-api/defaults/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 5dc98bf3a..05700d2eb 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -5739,8 +5739,8 @@ kong_apis:
     - name: cors
     - "{{ statsd_pulgin }}"
     - name: acl
-    config.whitelist:
-      - 'contentCreate'
+      config.whitelist:
+        - 'contentCreate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5757,8 +5757,8 @@ kong_apis:
       - name: cors
       - "{{ statsd_pulgin }}"
       - name: acl
-    config.whitelist:
-      - 'contentCreate'
+        config.whitelist:
+          - 'contentCreate'
       - name: rate-limiting
         config.policy: local
         config.hour: "{{ medium_rate_limit_per_hour }}"

From e236b481ea2e9ae2a6974c6a9d4c186848ca3be1 Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Tue, 13 Oct 2020 17:54:34 +0530
Subject: [PATCH 009/184] Added changes to indentation

---
 ansible/roles/kong-api/defaults/main.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 05700d2eb..e452265cf 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -5717,18 +5717,18 @@ kong_apis:
     upstream_url: "{{ content_service_url }}/content/v4/import"
     strip_uri: true
     plugins:
-  - name: jwt
-  - name: cors
-  - "{{ statsd_pulgin }}"
-  - name: acl
-    config.whitelist:
-      - 'contentCreate'
-  - name: rate-limiting
-    config.policy: local
-    config.hour: "{{ medium_rate_limit_per_hour }}"
-    config.limit_by: credential
-  - name: request-size-limiting
-    config.allowed_payload_size: "{{ medium_request_size_limit }}"
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'contentCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
   - name: contentFlag
     uris: "{{ content_prefix }}/v1/flag"

From 87b9e0838015caae80e5d280bf3c78a7a3749c34 Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Tue, 13 Oct 2020 18:02:01 +0530
Subject: [PATCH 010/184] Removed content onboarded v4 api's

---
 ansible/roles/kong-api/defaults/main.yml | 216 -----------------------
 1 file changed, 216 deletions(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index e452265cf..3e8c2d865 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -5585,219 +5585,3 @@ kong_apis:
       config.limit_by: credential
     - name: request-size-limiting
       config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentCreate
-    uris: "{{ content_prefix }}/v1/create"
-    upstream_url: "{{ content_service_url }}/content/v4/create"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentUpdate
-    uris: "{{ content_prefix }}/v1/update"
-    upstream_url: "{{ content_service_url }}/content/v4/update"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentRead
-    uris: "{{ content_prefix }}/v1/read"
-    upstream_url: "{{ content_service_url }}/content/v4/read"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentUpload
-    uris: "{{ content_prefix }}/v1/upload"
-    upstream_url: "{{ content_service_url }}/content/v4/upload"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentUploadUrl
-    uris: "{{ content_prefix }}/v1/upload/url"
-    upstream_url: "{{ content_service_url }}/content/v4/upload/url"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentCopy
-    uris: "{{ content_prefix }}/v1/copy"
-    upstream_url: "{{ content_service_url }}/content/v4/copy"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentDialcodeLink
-    uris: "{{ content_prefix }}/v1/dialcode/link"
-    upstream_url: "{{ content_service_url }}/content/v4/dialcode/link"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentImport
-    uris: "{{ content_prefix }}/v1/import"
-    upstream_url: "{{ content_service_url }}/content/v4/import"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentFlag
-    uris: "{{ content_prefix }}/v1/flag"
-    upstream_url: "{{ content_service_url }}/content/v4/flag"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentFlagAccept
-    uris: "{{ content_prefix }}/v1/flag/accept"
-    upstream_url: "{{ content_service_url }}/content/v4/flag/accept"
-    strip_uri: true
-    plugins:
-      - name: jwt
-      - name: cors
-      - "{{ statsd_pulgin }}"
-      - name: acl
-        config.whitelist:
-          - 'contentCreate'
-      - name: rate-limiting
-        config.policy: local
-        config.hour: "{{ medium_rate_limit_per_hour }}"
-        config.limit_by: credential
-      - name: request-size-limiting
-        config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentDiscard
-    uris: "{{ content_prefix }}/v1/flag/discard"
-    upstream_url: "{{ content_service_url }}/content/v4/flag/discard"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: contentRetire
-    uris: "{{ content_prefix }}/v1/flag/retire"
-    upstream_url: "{{ content_service_url }}/content/v4/flag/retire"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
\ No newline at end of file

From d15877765722d3dee275c2d9b950c32b1cfd99a9 Mon Sep 17 00:00:00 2001
From: satish Nirmalkar <satishkumar.nirmalkar@tarento.com>
Date: Tue, 13 Oct 2020 20:36:48 +0530
Subject: [PATCH 011/184] SB-20892 Onboarding dlete api

---
 ansible/roles/kong-api/defaults/main.yml      | 18 ++++++++++++++++++
 ansible/roles/kong-consumer/defaults/main.yml |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 0daa1bbbb..84979c0d7 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -4754,6 +4754,24 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
+  - name: deleteGroup
+    uris: "{{ group_service_prefix }}/v1/delete"
+    upstream_url: "{{ group_service_url }}/v1/group/delete"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'groupAdmin'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ small_request_size_limit }}"
+
   - name: groupActivityAgg
     uris: "{{ data_service_prefix }}/v1/group/activity/agg"
     upstream_url: "{{ lms_service_url }}/v1/group/activity/agg"
diff --git a/ansible/roles/kong-consumer/defaults/main.yml b/ansible/roles/kong-consumer/defaults/main.yml
index 77caf0ff4..2ab952531 100644
--- a/ansible/roles/kong-consumer/defaults/main.yml
+++ b/ansible/roles/kong-consumer/defaults/main.yml
@@ -25,6 +25,7 @@ mobile_device_groups:
   - groupCreate
   - groupUpdate
   - groupAccess
+  - groupAdmin
   - refreshTokenCreate
 
 kong_all_consumer_groups:
@@ -79,6 +80,7 @@ kong_all_consumer_groups:
   - groupCreate
   - groupUpdate
   - groupAccess
+  - groupAdmin
   - dataAccess
   - druidReportCreate
   - druidReportAdmin

From 8b156a22f991a99585ad9462966f75076ec6298f Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Wed, 14 Oct 2020 18:27:35 +0530
Subject: [PATCH 012/184] Added changes to the acl as per requested

---
 ansible/roles/kong-api/defaults/main.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 3e8c2d865..8a52df87f 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -5289,7 +5289,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentUpdate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5307,7 +5307,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5361,7 +5361,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentAdmin'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5397,7 +5397,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentUpdate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5415,7 +5415,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentUpdate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5433,7 +5433,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentAdmin'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5451,7 +5451,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentAdmin'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5469,7 +5469,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentAdmin'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5487,7 +5487,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentUpdate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5505,7 +5505,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentUpdate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5523,7 +5523,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentUpdate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5541,7 +5541,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentCreate'
+        - 'contentAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"

From b5753b6273aec3bf56b5c0a8ab515abbe20f51e8 Mon Sep 17 00:00:00 2001
From: rheafernandes <rheafernandeshallu@gmail.com>
Date: Wed, 14 Oct 2020 18:51:45 +0530
Subject: [PATCH 013/184] Added changes to the acl as per requested

---
 ansible/roles/kong-api/defaults/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 8a52df87f..5cb15cf39 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -5397,7 +5397,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'contentUpdate'
+        - 'contentAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5560,7 +5560,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-       - 'contentCreate'
+       - 'contentUpdate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"

From fdecf11afab7ec3b867494eccfbe916b4580899a Mon Sep 17 00:00:00 2001
From: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Date: Thu, 15 Oct 2020 12:02:30 +0530
Subject: [PATCH 014/184] Degrading the permission from admin to search to be
 used wity mobile devices. (#1989)

---
 ansible/roles/kong-api/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 25ad09a48..4fda41404 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -4587,7 +4587,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'certificateAdmin'
+        - 'certificateAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"

From 6b384c1af02af97fa2034d489f3dec773a66a0a3 Mon Sep 17 00:00:00 2001
From: kaliraja <34502260+Kaali09@users.noreply.github.com>
Date: Tue, 20 Oct 2020 15:48:16 +0530
Subject: [PATCH 015/184] added the druid alert rules (#1996)

* Issue #TG607: added the druid alert rules

* Issue #TG607: added the druid alert rules

* Issue #TG607: updated the druid alert rules

* Issue #0000: added the datasource name in message field.

* Issue #0000: removed the rollup datasource
---
 .../templates/alertrules.yaml                 |  16 +++
 .../alertrules/templates/promrulesDruid.yml   | 103 ++++++++++++++++++
 2 files changed, 119 insertions(+)
 create mode 100644 kubernetes/helm_charts/monitoring/alertrules/templates/promrulesDruid.yml

diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
index a646b18f9..5a6466670 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
@@ -43,3 +43,19 @@ kafka_telemetry_ingestion_backup_threshold_critical: "{{ kafka_telemetry_ingesti
 kafka_telemetry_unique_backup_threshold_critical: "{{ kafka_telemetry_unique_backup_threshold_critical }}"
 summary_backup_threshold_critical: "{{ summary_backup_threshold_critical }}"
 summary_channel_backup_threshold_critical: "{{ summary_channel_backup_threshold_critical }}"
+
+
+raw_druid_datasource:
+  - content-model-snapshot
+  - offline-desktop-events
+  - summary-events
+  - telemetry-events-syncts
+  - telemetry-feedback-events
+  - audit-rollup-syncts
+  - sl_observation_status
+  - sl_observations_production
+  - telemetry-feedback-events
+
+druid_raw_ingestion_threshold: 200000
+druid_rollup_ingestion_threshold: 200000
+
diff --git a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesDruid.yml b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesDruid.yml
new file mode 100644
index 000000000..d6b702b21
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesDruid.yml
@@ -0,0 +1,103 @@
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    role: alert-rules
+    app: {{ .Values.prometheus_rule_selector_app }}
+    release: {{ .Values.prometheus_rule_selector_release }}
+  name: {{ .Values.fullnameOverride }}-druid-rules
+  namespace: {{ .Values.namespace }}
+spec:
+  groups:
+  - name: alertrules.process
+    rules:
+    {{- if .Values.raw_druid_datasource }}
+    ## druid segment unavailable count alert
+    {{ range $key := .Values.raw_druid_datasource }}
+    - alert: druid_segment_unavailable_count
+      expr: druid_segment_unavailable_count{exported_job={{ . | quote }}} > 0
+      for: 5m
+      labels:
+        severity: critical
+        module: dp_lag
+      annotations:
+        message: The druid segment unavailable count for the datasource {{ . }} is greater than 0.
+        lag: {{`({{ humanize $value }})`}}
+        job_id: Druid
+        alertname: DruidSegmentUnavailable
+    {{- end }}
+     ### kafka druid ingest lag
+    {{ range $key := .Values.raw_druid_datasource }}
+    - alert: druid_ingest_kafka_lag
+      expr: druid_ingest_kafka_lag{exported_job={{ . | quote }}} > {{ $.Values.druid_raw_ingestion_threshold }}
+      for: 5m
+      labels:
+        severity: critical
+        module: dp_lag
+      annotations:
+        message: The druid ingestion lag for datasource {{ . }} is greater than threshold {{ $.Values.druid_raw_ingestion_threshold | int }}
+        lag: {{`({{ humanize $value }})`}}
+        job_id: Druid
+        alertname: DruidKafkaIngestionLag
+    {{- end }}
+     ### druid ingest handoff failed alert rules
+    {{ range $key := .Values.raw_druid_datasource }}
+    - alert: druid_ingest_handoff_failed
+      expr: druid_ingest_handoff_failed{exported_job={{ . | quote }}} > 0
+      for: 5m
+      labels:
+        severity: critical
+        module: dp_lag
+      annotations:
+        message: The druid ingest handoff failed count for datasource {{ . }} is greater than 0.
+        lag: {{`({{ humanize $value }})`}}
+        job_id: Druid
+        alertname: DruidIngestHandoffFailed
+    {{- end }}
+    {{- end }}
+
+    {{- if .Values.rollup_druid_cluster }}
+    ## druid segment unavailable count alert
+    {{ range $key := .Values.rollup_druid_datasource }}
+    - alert: druid_segment_unavailable_count
+      expr: druid_segment_unavailable_count{exported_job={{ . | quote }}} > 0
+      for: 5m
+      labels:
+        severity: critical
+        module: dp_lag
+      annotations:
+        message: The druid segment unavailable count for the datasource {{ . }} is greater than 0.
+        lag: {{`({{ humanize $value }})`}}
+        job_id: Druid
+        alertname: DruidSegmentUnavailable
+    {{- end }}
+     ### kafka druid ingest lag
+    {{ range $key := .Values.rollup_druid_datasource }}
+    - alert: druid_ingest_kafka_lag
+      expr: druid_ingest_kafka_lag{exported_job={{ . | quote }}} > {{ $.Values.druid_rollup_ingestion_threshold }}
+      for: 5m
+      labels:
+        severity: critical
+        module: dp_lag
+      annotations:
+        message: The druid ingestion lag for datasource {{ . }} is greater than {{ $.Values.druid_rollup_ingestion_threshold | int }}
+        lag: {{`({{ humanize $value }})`}}
+        job_id: Druid
+        alertname: DruidKafkaIngestionLag
+    {{- end }}
+     ### druid ingest handoff failed alert rules
+    {{ range $key := .Values.rollup_druid_datasource }}
+    - alert: druid_ingest_handoff_failed
+      expr: druid_ingest_handoff_failed{exported_job={{ . | quote }}} > 0
+      for: 5m
+      labels:
+        severity: critical
+        module: dp_lag
+      annotations:
+        message: The druid ingest handoff failed count for datasource {{ . }} is greater than 0.
+        lag: {{`({{ humanize $value }})`}}
+        job_id: Druid
+        alertname: DruidIngestHandoffFailed
+    {{- end }}
+    {{- end }} 

From 715a87c6e9b562e8fee65df78a8a6d97d9e12c33 Mon Sep 17 00:00:00 2001
From: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Date: Thu, 22 Oct 2020 13:27:57 +0530
Subject: [PATCH 016/184] SB-20938 added create and update feed api details
 (#1998)

---
 ansible/roles/kong-api/defaults/main.yml | 36 ++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 4dee3c646..b615a9eac 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -4343,6 +4343,42 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
+  - name: userFeedCreate
+    uris: "{{ user_service_prefix }}/feed/v1/create"
+    upstream_url: "{{ learning_service_url }}/v1/user/feed/create"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'userAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
+  
+  - name: userFeedUpdate
+    uris: "{{ user_service_prefix }}/feed/v1/update"
+    upstream_url: "{{ learning_service_url }}/v1/user/feed/update"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'userAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
+
   - name: userMigrate
     uris: "{{ user_service_prefix }}/v1/migrate"
     upstream_url: "{{ learning_service_url }}/v1/user/migrate"

From f95f3782129299bba4bb78662e1611d1ed3b209e Mon Sep 17 00:00:00 2001
From: sknirmalkar89 <59080585+sknirmalkar89@users.noreply.github.com>
Date: Thu, 22 Oct 2020 15:00:50 +0530
Subject: [PATCH 017/184] SC-2059 Adding new membership update api (#1999)

---
 ansible/roles/kong-api/defaults/main.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index b615a9eac..4d533ea44 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -4829,6 +4829,24 @@ kong_apis:
       - name: request-size-limiting
         config.allowed_payload_size: "{{ small_request_size_limit }}"
 
+  - name: updateGroupMembership
+    uris: "{{ group_service_prefix }}/membership/v1/update"
+    upstream_url: "{{ group_service_url }}/v1/group/membership/update"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'groupUpdate'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ small_request_size_limit }}"
+
   - name: groupActivityAgg
     uris: "{{ data_service_prefix }}/v1/group/activity/agg"
     upstream_url: "{{ lms_service_url }}/v1/group/activity/agg"

From 83b5fb069c700105120f8eebbcc0561e2b8abea1 Mon Sep 17 00:00:00 2001
From: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Date: Thu, 22 Oct 2020 16:12:33 +0530
Subject: [PATCH 018/184] SB-20938 added feed-delete api details (#2000)

* SB-20938 added create and update feed api details

* SB-20938 added feed-delete api details
---
 ansible/roles/kong-api/defaults/main.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 4d533ea44..893415959 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -4360,6 +4360,24 @@ kong_apis:
       config.limit_by: credential
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
+
+  - name: userFeedDelete
+    uris: "{{ user_service_prefix }}/feed/v1/delete"
+    upstream_url: "{{ learning_service_url }}/v1/user/feed/delete"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'userAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
   
   - name: userFeedUpdate
     uris: "{{ user_service_prefix }}/feed/v1/update"

From af89610a2ac5123e9cd2de1c9adcde2d68e5ca26 Mon Sep 17 00:00:00 2001
From: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Date: Fri, 23 Oct 2020 12:05:49 +0530
Subject: [PATCH 019/184] SB-21121 limiting feeds to 30 (#2001)

* SB-21121 limiting feeds to 30

* SB-21121 limiting feeds to 30

* Update sunbird_learner-service.env

update the user-feed property.
---
 .../roles/stack-sunbird/templates/sunbird_learner-service.env   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
index 7c525f229..a03b1c5b4 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
@@ -112,6 +112,8 @@ sunbird_otp_allowed_attempt={{sunbird_otp_allowed_attempt|default(2)}}
 SUNBIRD_KAFKA_URL={{kafka_urls}}
 ENV_NAME={{env_name}}
 notification_service_base_url=http://notification-service:9000
+# Release-3.4.0
+feed_limit={{feed_limit | default(30)}}
 
 ## Access Keys ##
 accesstoken.publickey.basepath={{learner_device_basepath | default('/keys/')}}

From 37bccacc9e5218ae6213ada555495ea064e70fe5 Mon Sep 17 00:00:00 2001
From: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Date: Tue, 27 Oct 2020 17:30:38 +0530
Subject: [PATCH 020/184] Implementing the keycloak URL whitelisting for the
 entire sunbird stack. (#1995)

* Adding all the keycloak endpoints being used by entire sunbird stack

* Adding the nginx client IP for x-forwarded-for header and x-real-ip and making remote_addr as default

* Remove the mirror configuration

* Have a general rule for forgot-password and userdetails admin keycloak
---
 .../core/nginx-public-ingress/values.j2       | 137 +++++++++---------
 1 file changed, 66 insertions(+), 71 deletions(-)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 9fbb0f7fb..85e92c821 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -116,43 +116,14 @@ proxyconfig: |-
     proxy_set_header    X-Forwarded-Proto $scheme;
     ignore_invalid_headers off;  #pass through headers from Jenkins which are considered invalid by Nginx server.
     resolver {{ kube_dns_ip }} valid=30s;
-    location ~* ^/auth/(.*)/impersonation {
-      return 301 {{proto}}://{{ proxy_server_name }};
-    }
-    location ~* ^/auth/realms/master {
-      return 301 {{proto}}://{{ proxy_server_name }};
-    }
-    location ~* ^/auth/admin/master/console/ {
-      return 301 {{proto}}://{{ proxy_server_name }};
-    }
-    location ~* ^/auth/realms/(.+)/token/introspect/ {
-          return 301 {{proto}}://$host/api/auth/v1/realms/$1/token/introspect;
-    }
-    location ~* ^/auth/realms/(.+)/token/ {
-      return 301  {{proto}}://$host/api/auth/v1/realms/$1/token/;
-    }
-    location ~* ^/auth/realms/(.+)/userinfo/ {
-      return 301 {{proto}}://$host/api/auth/v1/realms/$1/userinfo/;
-    }
-    location ~* ^/auth/realms/(.+)/logout/ {
-      return 301 {{proto}}://$host/api/auth/v1/realms/$1/logout/;
-    }
-    location ~* ^/auth/realms/(.+)/certs/ {
-      return 301 {{proto}}://$host/api/auth/v1/realms/$1/certs/;
-    }
-    location ~* ^/auth/realms/(.+)/clients-registrations/ {
-      return 301 {{proto}}://$host/api/auth/v1/realms/$1/clients-registrations/;
-    }
-    location ~* ^/auth/admin/master/console/ {
-      return 301 {{proto}}://{{ proxy_server_name }};
-    }
+    # Mobile Devices Refresh token Endpoints
     location ~* ^/auth/v1/refresh/token  {
       rewrite ^/auth/(.*) /auth/$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Scheme $scheme;
-      proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-For   {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Forwarded-Proto $scheme;
       proxy_connect_timeout 5;
       proxy_send_timeout 60;
@@ -161,20 +132,34 @@ proxyconfig: |-
       proxy_set_header X-Request-ID $sb_request_id;
       proxy_pass http://kong;
     }
-    location /auth/ {
+    # Admin API Endpoints for sunbird realm fpr forgot password flow
+    location ~ /auth/admin/realms/sunbird/users/ {
       rewrite ^/auth/(.*) /auth/$1 break;
       proxy_set_header X-Request-ID $sb_request_id;
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Scheme $scheme;
-      proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-For   {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Forwarded-Proto $scheme;
       proxy_set_header Connection "";
       proxy_http_version 1.1;
       proxy_pass http://keycloak;
     }
-    # Caching keycloak static assets
-    location ~ /auth/resources/(.+\.(png|svg|ico|js|eot|ttf|woff|woff2|css)) {
+    # Sunbird realm keycloak API endpoints
+    location ~ /auth/realms/sunbird/(get-required-action-link|login-actions/(action-token|authenticate|required-action)|protocol/openid-connect/(auth|certs|logout|token|userinfo)|.well-known/openid-configuration) {
+      rewrite ^/auth/(.*) /auth/$1 break;
+      proxy_set_header X-Request-ID $sb_request_id;
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
+      proxy_set_header X-Scheme $scheme;
+      proxy_set_header X-Forwarded-For   {{ nginx_client_public_ip_header | d('$remote_addr') }};
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header Connection "";
+      proxy_http_version 1.1;
+      proxy_pass http://keycloak;
+    }
+    # Static Assets for keycloak endpoints with caching
+    location ~ /auth/(resources/(.+\.(png|svg|ico|js|eot|ttf|woff|woff2|css))|welcome-content/(.+\.(png|svg|ico|js|eot|ttf|woff|woff2|css))) {
       # Enabling caching
       proxy_cache_key $proxy_host$request_uri;
       proxy_cache proxy_cache;
@@ -190,13 +175,13 @@ proxyconfig: |-
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Scheme $scheme;
-      proxy_set_header    X-Forwarded-For   {{ nginx_client_public_ip_header | d('$remote_addr') }};
+      proxy_set_header X-Forwarded-For   {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_connect_timeout 5;
       proxy_send_timeout 60;
       proxy_read_timeout 70;
       proxy_http_version 1.1;
       proxy_pass http://keycloak;
-  }
+    }
     # This is Caching mechanism for POST requests location search
     location ~ /learner/data/v1/location/search {
       # Enabling caching
@@ -984,40 +969,14 @@ keycloakconf: |
     proxy_set_header    X-Forwarded-Proto $scheme;
     ignore_invalid_headers off;  #pass through headers from Jenkins which are considered invalid by Nginx server.
     resolver 127.0.0.11 valid=5s;
-    location ~* ^/auth/(.*)/impersonation {
-      return 301 {{proto}}://{{ proxy_server_name }};
-    }
-    location ~* ^/auth/realms/master {
-      return 301 {{proto}}://{{ proxy_server_name }};
-    }
-    location ~* ^/auth/admin/master/console/ {
-      return 301 {{proto}}://{{ proxy_server_name }};
-    }
-    location ~* ^/auth/realms/(.+)/token/introspect/ {
-          return 301 {{proto}}://$host/api/auth/v1/realms/$1/token/introspect;
-    }
-    location ~* ^/auth/realms/(.+)/token/ {
-      return 301  {{proto}}://$host/api/auth/v1/realms/$1/token/;
-    }
-    location ~* ^/auth/realms/(.+)/userinfo/ {
-      return 301 {{proto}}://$host/api/auth/v1/realms/$1/userinfo/;
-    }
-    location ~* ^/auth/realms/(.+)/logout/ {
-      return 301 {{proto}}://$host/api/auth/v1/realms/$1/logout/;
-    }
-    location ~* ^/auth/realms/(.+)/certs/ {
-      return 301 {{proto}}://$host/api/auth/v1/realms/$1/certs/;
-    }
-    location ~* ^/auth/realms/(.+)/clients-registrations/ {
-      return 301 {{proto}}://$host/api/auth/v1/realms/$1/clients-registrations/;
-    }
+    # Refresh token endpoint being routed to kong
     location ~* ^/auth/v1/refresh/token  {
       rewrite ^/auth/(.*) /auth/$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Scheme $scheme;
-      proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-For   {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Forwarded-Proto $scheme;
       proxy_connect_timeout 5;
       proxy_send_timeout 60;
@@ -1026,19 +985,55 @@ keycloakconf: |
       proxy_set_header X-Request-ID $sb_request_id;
       proxy_pass http://kong;
     }
-    location ~* ^/auth/admin/master/console/ {
-      return 301 {{proto}}://{{ merge_proxy_server_name }};
+    # Admin API Endpoints for sunbird realm fpr forgot password flow
+    location ~ /auth/admin/realms/sunbird/users/ {
+      rewrite ^/auth/(.*) /auth/$1 break;
+      proxy_set_header X-Request-ID $sb_request_id;
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
+      proxy_set_header X-Scheme $scheme;
+      proxy_set_header X-Forwarded-For   {{ nginx_client_public_ip_header | d('$remote_addr') }};
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header Connection "";
+      proxy_http_version 1.1;
+      proxy_pass http://keycloak;
     }
-    location /auth/ {
-      set $target {{ keycloak_url }};
+    # Sunbird realm keycloak API endpoints
+    location ~ /auth/realms/sunbird/(get-required-action-link|login-actions/(action-token|authenticate|required-action)|protocol/openid-connect/(auth|certs|logout|token|userinfo)|.well-known/openid-configuration) {
       rewrite ^/auth/(.*) /auth/$1 break;
       proxy_set_header X-Request-ID $sb_request_id;
-      proxy_pass $target;
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Scheme $scheme;
-      proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-For   {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header Connection "";
+      proxy_http_version 1.1;
+      proxy_pass http://keycloak;
+    }
+    # Static Assets for keycloak endpoints with caching
+    location ~ /auth/(resources/(.+\.(png|svg|ico|js|eot|ttf|woff|woff2|css))|welcome-content/(.+\.(png|svg|ico|js|eot|ttf|woff|woff2|css))) {
+      # Enabling caching
+      proxy_cache_key $proxy_host$request_uri;
+      proxy_cache proxy_cache;
+      add_header X-Proxy-Cache $upstream_cache_status;
+      add_header X-Proxy-Cache-Date $upstream_http_date;
+      proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
+      proxy_cache_revalidate on;
+      proxy_cache_background_update on;
+      proxy_cache_lock on;
+      proxy_cache_valid 200 14400;
+      rewrite ^/auth/(.*) /auth/$1 break;
+      proxy_set_header Connection "";
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
+      proxy_set_header X-Scheme $scheme;
+      proxy_set_header X-Forwarded-For   {{ nginx_client_public_ip_header | d('$remote_addr') }};
+      proxy_connect_timeout 5;
+      proxy_send_timeout 60;
+      proxy_read_timeout 70;
+      proxy_http_version 1.1;
+      proxy_pass http://keycloak;
     }
     location / {
       rewrite ^/(.*) /$1 break;

From 244400778e0296b860d6141d2da1b01445fbbb76 Mon Sep 17 00:00:00 2001
From: Rhea Fernandes <32357913+rheafernandes@users.noreply.github.com>
Date: Tue, 27 Oct 2020 19:14:08 +0530
Subject: [PATCH 021/184] Added code changes for forms api support (#2006)

---
 .../stack-sunbird/templates/content-service_application.conf     | 1 +
 .../stack-sunbird/templates/taxonomy-service_application.conf    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index 12f649202..e5d252180 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -564,4 +564,5 @@ mimeTypeToPrimaryCategory {
 channel.content.primarycategories=["Explanation Content", "Learning Resource", "Practice Question Set", "eTextbook", "Teacher Resource", "Course Assessment"]
 channel.collection.primarycategories=["Course", "Digital Textbook", "Content Playlist"]
 channel.asset.primarycategories=["Asset"]
+objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_store"
 
diff --git a/ansible/roles/stack-sunbird/templates/taxonomy-service_application.conf b/ansible/roles/stack-sunbird/templates/taxonomy-service_application.conf
index fe251b214..66a27cfe6 100644
--- a/ansible/roles/stack-sunbird/templates/taxonomy-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/taxonomy-service_application.conf
@@ -389,3 +389,4 @@ languageCode {
   tamil : "ta"
   telugu : "te"
 }
+objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_store"

From fc8845be2f8487412710209cb864ba96b054460f Mon Sep 17 00:00:00 2001
From: sknirmalkar89 <59080585+sknirmalkar89@users.noreply.github.com>
Date: Wed, 28 Oct 2020 17:37:43 +0530
Subject: [PATCH 022/184] SB-20957 Create a new jenkins scripts for groups data
 correction (#2007)

* SB-20957 new jenkins job for groups service

* SB-20957 adding jenkins to run paramter based jar

* SB-20957 adding jenkins to run paramter based jar
---
 ansible/cassandra-deploy-decrypt.yml                     | 1 +
 ansible/roles/cassandra-deploy-decrypt/defaults/main.yml | 1 +
 ansible/roles/cassandra-deploy-decrypt/tasks/main.yml    | 4 ++--
 pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ansible/cassandra-deploy-decrypt.yml b/ansible/cassandra-deploy-decrypt.yml
index 341631a4b..fa0053cdc 100644
--- a/ansible/cassandra-deploy-decrypt.yml
+++ b/ansible/cassandra-deploy-decrypt.yml
@@ -5,6 +5,7 @@
     sunbird_cassandra_port: 9042
     sunbird_cassandra_keyspace: sunbird
     sunbird_encryption_key: "{{ core_vault_sunbird_encryption_key }}"
+    sunbird_cassandra_groups_keyspace: sunbird_groups
   vars_files:
     - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
   roles:
diff --git a/ansible/roles/cassandra-deploy-decrypt/defaults/main.yml b/ansible/roles/cassandra-deploy-decrypt/defaults/main.yml
index c38c2c9d3..02efebd0e 100644
--- a/ansible/roles/cassandra-deploy-decrypt/defaults/main.yml
+++ b/ansible/roles/cassandra-deploy-decrypt/defaults/main.yml
@@ -1,2 +1,3 @@
 cassandra_jar_path: ../
 cassandra_deploy_path: /home/deployer
+cassandra_jar_name: user-declaration-util-1.0-SNAPSHOT-jar-with-dependencies.jar
diff --git a/ansible/roles/cassandra-deploy-decrypt/tasks/main.yml b/ansible/roles/cassandra-deploy-decrypt/tasks/main.yml
index 54787a84e..0275452cd 100644
--- a/ansible/roles/cassandra-deploy-decrypt/tasks/main.yml
+++ b/ansible/roles/cassandra-deploy-decrypt/tasks/main.yml
@@ -1,10 +1,10 @@
 - name: Copy the jar
   become: yes
   copy:
-    src: "{{cassandra_jar_path}}/user-declaration-util-1.0-SNAPSHOT-jar-with-dependencies.jar"
+    src: "{{cassandra_jar_path}}/{{cassandra_jar_name}}"
     dest: "{{cassandra_deploy_path}}"
   run_once: true
 
 - name: Run the application
-  shell: java -jar user-declaration-util-1.0-SNAPSHOT-jar-with-dependencies.jar
+  shell: "java -jar {{cassandra_jar_name}}"
   run_once: true
diff --git a/pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt b/pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt
index c695d7a97..ae6eae690 100644
--- a/pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt
+++ b/pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt
@@ -30,7 +30,7 @@ node() {
                        unzip ${artifact}
                     """
                     ansiblePlaybook = "${currentWs}/ansible/cassandra-deploy-decrypt.yml"
-                    ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass -v"
+                    ansibleExtraArgs = "-e cassandra_jar_name=\"${params.cassandra_jar_name}\"    --vault-password-file /var/lib/jenkins/secrets/vault-pass -v "
                     values.put('ansiblePlaybook', ansiblePlaybook)
                     values.put('ansibleExtraArgs', ansibleExtraArgs)
                     println values

From 8e63180028a3655794f5e31ca1dbe1ec3340659a Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Mon, 2 Nov 2020 12:20:36 +0530
Subject: [PATCH 023/184] Merge 3.3.0 to 3.4.0 (#2015)

* Issue #SB-21135 feat: Updated LMS configuration (#2003)

* Issue #SC-1929 feat: Courses logback changes

* Issue #SC-2041 feat: Updated issue certificate topic config

* Issue #SB-21135 feat: Updated LMS configuration

* Issue #SB-21135 feat: Updated LMS configuration

* Issue #SB-21135 feat: Updated LMS configuration

* Enanbling secured way to upload files using jenkins (#2004)

* Issue #SB-21123 fix: updated config for search-service (#2005)

* Issue #SB-21123 fix: updated config for search-service

* Issue #SB-21123 fix: updated variable name

* Merge 3.2.7 to 3.3.0 (#2008)

* Added the secor process alert rules. (#2012)

* added the druid alert rules (#1996)

* Issue #TG607: added the druid alert rules

* Issue #TG607: added the druid alert rules

* Issue #TG607: updated the druid alert rules

* Issue #0000: added the datasource name in message field.

* Issue #0000: removed the rollup datasource

* Issue #0000: added the secor process alert rules

* Issue #0000: added the email config

* Issue #0000: added the secor processes names

* Issue #0000: updated the alert name

* Issue #0000: removed the old secor alertrules

* Issue #TG-641: updated the alert rules

Co-authored-by: Pradyumna <pradyumnan@ilimi.in>
Co-authored-by: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Co-authored-by: Kumar Gauraw <gaurawk@ilimi.in>
Co-authored-by: kaliraja <34502260+Kaali09@users.noreply.github.com>
---
 ansible/cert-file-upload.yml                  |  10 ++
 .../roles/cert-file-upload/defaults/main.yml  |   2 +
 ansible/roles/cert-file-upload/tasks/main.yml |   7 ++
 ansible/roles/kong-api/defaults/main.yml      |   1 -
 .../content-service_application.conf          |   1 -
 .../sunbird_knowledge-mw-service.env          |   4 +-
 .../templates/sunbird_lms-service.env         |   4 +-
 .../roles/sunbird-deploy/tasks/main.yml       |   2 +-
 .../templates/alertrules.yaml                 |  20 ++++
 .../templates/prometheus-operator.yaml        |  23 +++-
 .../templates/daemonset.yaml                  |   2 +
 .../core/nginx-public-ingress/values.j2       | 106 ++++++++++++++++--
 .../alertrules/templates/promrulesProcess.yml |  24 ----
 .../templates/promrulesSecorProcess.yml       |  29 +++++
 .../dashboards/dashboards/nginx-detailed.json |  38 +++----
 pipelines/certs-templates/Jenkinsfile.upload  |  61 ++++++++++
 16 files changed, 268 insertions(+), 66 deletions(-)
 create mode 100644 ansible/cert-file-upload.yml
 create mode 100644 ansible/roles/cert-file-upload/defaults/main.yml
 create mode 100644 ansible/roles/cert-file-upload/tasks/main.yml
 create mode 100644 kubernetes/helm_charts/monitoring/alertrules/templates/promrulesSecorProcess.yml
 create mode 100644 pipelines/certs-templates/Jenkinsfile.upload

diff --git a/ansible/cert-file-upload.yml b/ansible/cert-file-upload.yml
new file mode 100644
index 000000000..e29a7b6c2
--- /dev/null
+++ b/ansible/cert-file-upload.yml
@@ -0,0 +1,10 @@
+---
+- hosts: localhost
+  become: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  environment:
+    AZURE_STORAGE_ACCOUNT: "{{ sunbird_public_storage_account_name }}"
+    AZURE_STORAGE_KEY: "{{ sunbird_public_storage_account_key }}"
+  roles:
+   - cert-file-upload
diff --git a/ansible/roles/cert-file-upload/defaults/main.yml b/ansible/roles/cert-file-upload/defaults/main.yml
new file mode 100644
index 000000000..b74bef14c
--- /dev/null
+++ b/ansible/roles/cert-file-upload/defaults/main.yml
@@ -0,0 +1,2 @@
+file_name: "certUploadedfile"
+cert_template_artifacts_container_name: "e-credentials"
diff --git a/ansible/roles/cert-file-upload/tasks/main.yml b/ansible/roles/cert-file-upload/tasks/main.yml
new file mode 100644
index 000000000..9fcaf6a67
--- /dev/null
+++ b/ansible/roles/cert-file-upload/tasks/main.yml
@@ -0,0 +1,7 @@
+- name: rename the file to the correct name as required in blobstore
+  command: "mv /tmp/certUploadedfile /tmp/{{file_name}}"
+
+- name: Upload to azure blob storage
+  command: "az storage blob upload -c {{ cert_template_artifacts_container_name }} --name {{ file_name }} -f /tmp/{{file_name}}"
+  async: 3600
+  poll: 10
diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 893415959..1c01c239f 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -1,4 +1,3 @@
-
 ---
 # Guideline for PR Merging: https://project-sunbird.atlassian.net/wiki/spaces/DevOps/pages/1210777612/API+Manager+Kong+BEST+Practices+Documentation.
 
diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index e5d252180..fb31f84f4 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -565,4 +565,3 @@ channel.content.primarycategories=["Explanation Content", "Learning Resource", "
 channel.collection.primarycategories=["Course", "Digital Textbook", "Content Playlist"]
 channel.asset.primarycategories=["Asset"]
 objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_store"
-
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env b/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env
index 6a17b9f2d..ec8132a2a 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env
@@ -19,11 +19,11 @@ sunbird_content_service_blacklisted_channels={{content_service_blacklisted_chann
 sunbird_default_channel={{sunbird_default_channel}}
 sunbird_content_repo_api_base_url={{sunbird_content_repo_api_base_url}}
 sunbird_content_repo_api_key={{sunbird_content_repo_api_key}}
-sunbird_search_service_api_base_url={{sunbird_search_service_api_base_url}}
+sunbird_search_service_api_base_url={{knowledge_mw_sunbird_search_service_api_base_url | default('http://search-service:9000')}}
 sunbird_search_service_api_key={{sunbird_search_service_api_key}}
 sunbird_dial_repo_api_base_url={{sunbird_dial_repo_api_base_url}}
 sunbird_dial_repo_api_key={{sunbird_dial_repo_api_key}}
-sunbird_plugin_repo_api_base_url={{sunbird_plugin_repo_api_base_url}}
+sunbird_plugin_repo_api_base_url={{knowledge_mw_sunbird_plugin_repo_api_base_url | default('http://search-service:9000')}}
 sunbird_plugin_repo_api_key={{sunbird_plugin_repo_api_key}}
 sunbird_data_service_api_base_url={{sunbird_data_service_api_base_url}}
 sunbird_data_service_api_key={{sunbird_data_service_api_key}}
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
index 958982df0..42859c390 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
@@ -19,8 +19,8 @@ sunbird_pg_user={{sunbird_pg_user}}
 sunbird_pg_password={{sunbird_pg_password}}
 sunbird_installation={{sunbird_installation}}
 sunbird_analytics_api_base_url={{sunbird_analytics_api_base_url}}
-sunbird_search_service_api_base_url={{sunbird_search_service_api_base_url}}
-ekstep_api_base_url={{sunbird_content_service_api_base_url}}
+sunbird_search_service_api_base_url={{ lms_search_service_api_base_url | default('http://search-service:9000') }}
+ekstep_api_base_url={{ lms_ekstep_api_base_url | default('http://content-service:9000') }}
 sunbird_group_service_api_base_url={{sunbird_group_service_api_base_url}}
 sunbird_mail_server_host={{sunbird_mail_server_host}}
 sunbird_mail_server_port={{sunbird_mail_server_port}}
diff --git a/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml b/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
index 95b651e36..9d7ad2ee9 100644
--- a/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
+++ b/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
@@ -41,7 +41,7 @@
   when: release_name == "learner" or release_name == "lms" or release_name == "groups"
 
 - name: helm upgrade
-  shell: helm upgrade --install --atomic --timeout 10m {{ release_name }} {{ chart_path }} -n {{namespace}}
+  shell: helm upgrade --install --atomic --timeout {{helm_install_timeout | d('10m')}} {{ release_name }} {{ chart_path }} -n {{namespace}}
 
 - name: Clean up keys
   include_role:
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
index 5a6466670..b448efd7d 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
@@ -59,3 +59,23 @@ raw_druid_datasource:
 druid_raw_ingestion_threshold: 200000
 druid_rollup_ingestion_threshold: 200000
 
+secor_process_names:
+  - channel-telemetry-backup
+  - derived-telemetry-backup
+  - derived-denorm-events-backup
+  - channel-summary-backup
+  - assess-events-backup
+  - assess-raw-events-backup
+  - device-profile-backup
+  - learning-events-backup
+  - learning-failed-backup
+  - content-consumption-events-backup
+  - failed-telemetry-backup
+  - extractor-duplicate-backup
+  - extractor-failed-backup
+  - unique-telemetry-backup
+  - denorm-events-backup
+  - raw-telemetry-backup
+  - ingestion-telemetry-backup
+  - ingestion-cluster-telemetry-backup
+  - telemetry-ingest-backup
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/prometheus-operator.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/prometheus-operator.yaml
index 11d250f2e..ce05bde3a 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/prometheus-operator.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/prometheus-operator.yaml
@@ -145,11 +145,18 @@ alertmanager:
             text: |-
                   {{ "{{" }} range .Alerts {{ "}}" }}
                      *Alert:* {{ "{{" }} .Annotations.alertname {{ "}}" }}
-                    *processName:* {{ "{{" }} .Annotations.job_id {{ "}}" }}
+                    *ProcessName:* {{ "{{" }} .Annotations.job_id {{ "}}" }}
                     *AlertType:* {{ "{{" }} .Labels.severity {{ "}}" }}
                     *Details:* {{ "{{" }} .Annotations.message {{ "}}" }}
                   {{ "{{" }} end {{ "}}" }}
             icon_emoji: ':dart:'
+    
+        email_configs:
+          - send_resolved: true
+            to: '{{ default_mailing_list }}'
+            html: '{% raw %}{{ template "email.default.html" . }}{% endraw %}'
+            headers:
+              subject: '[{{ kubernetes_cluster_name }}] {% raw %}{{ .GroupLabels.alertname }}{% endraw %}'
 
       - name: 'dp-lag_slack_warning'
         slack_configs:
@@ -168,6 +175,13 @@ alertmanager:
                     *Details:* {{ "{{" }} .Annotations.message {{ "}}" }}
                     {{ "{{" }} end {{ "}}" }}
             icon_emoji: ':dart:'
+            
+        email_configs:
+          - send_resolved: true
+            to: '{{ default_mailing_list }}'
+            html: '{% raw %}{{ template "email.default.html" . }}{% endraw %}'
+            headers:
+              subject: '[{{ kubernetes_cluster_name }}] {% raw %}{{ .GroupLabels.alertname }}{% endraw %}'
 
       - name: 'dp-lag_slack_critical'
         slack_configs:
@@ -186,6 +200,13 @@ alertmanager:
                     *Details:* {{ "{{" }} .Annotations.message {{ "}}" }}
                     {{ "{{" }} end {{ "}}" }}
             icon_emoji: ':dart:'
+            
+        email_configs:
+          - send_resolved: true
+            to: '{{ default_mailing_list }}'
+            html: '{% raw %}{{ template "email.default.html" . }}{% endraw %}'
+            headers:
+              subject: '[{{ kubernetes_cluster_name }}] {% raw %}{{ .GroupLabels.alertname }}{% endraw %}'
 
       {% for item in alert_teams %}
       # Comment to ensure proper indentation while templating
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml b/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
index 929a28e6c..3b647c055 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
@@ -10,6 +10,8 @@ spec:
       app: nginx-public-ingress
   updateStrategy:
     type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 25%
   template:
     metadata:
       annotations:
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 85e92c821..b10380df3 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -169,7 +169,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 14400;
+      proxy_cache_valid 200 43200;
       rewrite ^/auth/(.*) /auth/$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
@@ -194,7 +194,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 14400;
+      proxy_cache_valid 200 43200;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
@@ -219,7 +219,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 3600s;
+      proxy_cache_valid 200 14400s;
       # Increasing the proxy buffer size
       proxy_buffer_size 16k;
       proxy_busy_buffers_size 16k;
@@ -246,7 +246,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 3600s;
+      proxy_cache_valid 200 14400s;
       # Increasing the proxy buffer size
       proxy_buffer_size 16k;
       proxy_busy_buffers_size 16k;
@@ -273,7 +273,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 14400;
+      proxy_cache_valid 200 43200;
       rewrite ^/api/(.*) /$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
@@ -297,7 +297,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 14400;
+      proxy_cache_valid 200 43200;
       rewrite ^/api/(.*) /$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
@@ -705,6 +705,90 @@ proxyconfig: |-
          proxy_set_header X-Request-ID $sb_request_id;
          proxy_pass             https://$offline_bucket/$url_full;
   }
+    # compression for svg certs download                      
+    location /api/certreg/v2/certs/download {                 
+      rewrite ^/api/(.*) /$1 break;                           
+      # Compression                                           
+      gzip on;                                                
+      gzip_comp_level    5;                                   
+      gzip_min_length    50000; # 50KB                                
+      gzip_proxied       any;                                 
+      gzip_vary          on;                                  
+      # Content types for compression                         
+      gzip_types                                              
+      application/atom+xml                                    
+      application/javascript                                  
+      application/json                                        
+      application/ld+json                                     
+      application/manifest+json                               
+      application/rss+xml                                     
+      application/vnd.geo+json                                
+      application/vnd.ms-fontobject                           
+      application/x-font-ttf                                  
+      application/x-web-app-manifest+json                     
+      application/xhtml+xml                                   
+      application/xml                                         
+      font/opentype                                           
+      image/bmp                                               
+      image/svg+xml                                           
+      image/x-icon                                            
+      text/cache-manifest                                     
+      text/css                                                
+      text/plain                                              
+      add_header test hello;                                  
+      proxy_set_header Connection "";                         
+      proxy_set_header Host $host;                            
+      proxy_set_header X-Real-IP $remote_addr;                
+      proxy_set_header X-Scheme $scheme;                      
+      proxy_set_header    X-Forwarded-For   $remote_addr;     
+      proxy_connect_timeout 5;                                
+      proxy_send_timeout 60;                                  
+      proxy_read_timeout 70;                                  
+      proxy_http_version 1.1;                                 
+      proxy_set_header X-Request-ID $sb_request_id;           
+      proxy_pass http://kong;                                 
+    }                                                         
+    location /learner/certreg/v2/certs/download {
+      # Compression
+      gzip on;
+      gzip_comp_level    5;
+      gzip_min_length    50000; # 50KB
+      gzip_proxied       any;
+      gzip_vary          on;
+      # Content types for compression
+      gzip_types
+      application/atom+xml
+      application/javascript
+      application/json
+      application/ld+json
+      application/manifest+json
+      application/rss+xml
+      application/vnd.geo+json
+      application/vnd.ms-fontobject
+      application/x-font-ttf
+      application/x-web-app-manifest+json
+      application/xhtml+xml
+      application/xml
+      font/opentype
+      image/bmp
+      image/svg+xml
+      image/x-icon
+      text/cache-manifest
+      text/css
+      text/plain
+      add_header test hello;
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Scheme $scheme;
+      proxy_connect_timeout 5;
+      proxy_send_timeout 60;
+      proxy_read_timeout 70;
+      proxy_set_header    X-Forwarded-Proto $scheme;
+      proxy_set_header Connection "";
+      proxy_http_version 1.1;
+      proxy_set_header X-Request-ID $sb_request_id;
+      proxy_pass http://player;
+    }
     location / {
       rewrite ^/(.*) /$1 break;
       proxy_set_header Host $host;
@@ -747,14 +831,14 @@ proxyconfig: |-
     }
     location  ~ /resourcebundles/v1/read|/learner/data/v1/(role/read|system/settings/get)|/v1/tenant/info  {
       proxy_cache_key $proxy_host$request_uri;
-      proxy_cache proxy_cache;
+      proxy_cache framework_cache;
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
       proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 14400;
+      proxy_cache_valid 200 43200;
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Scheme $scheme;
@@ -772,7 +856,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 14400;
+      proxy_cache_valid 200 43200;
       rewrite ^/api/channel/v1/read/(.*) /channel/v1/read/$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
@@ -925,11 +1009,11 @@ nginxconfig: |
       # caching for images and files
       proxy_cache_path /tmp/proxy_cache levels=1:2 keys_zone=tmp_cache:5m max_size=10m inactive=300m use_temp_path=off;
       # caching for apis
-      proxy_cache_path /tmp/api_cache levels=1:2 keys_zone=proxy_cache:5m max_size=300m inactive=300m use_temp_path=off;
+      proxy_cache_path /tmp/api_cache levels=1:2 keys_zone=proxy_cache:5m max_size=600m inactive=1400m use_temp_path=off;
       # cache framework
       proxy_cache_path /tmp/framework_cache levels=1:2 keys_zone=framework_cache:5m max_size=700m inactive=300m use_temp_path=off;
       # cache content
-      proxy_cache_path /tmp/content_cache levels=1:2 keys_zone=content_cache:100m max_size=1500m inactive=300m use_temp_path=off;
+      proxy_cache_path /tmp/content_cache levels=1:2 keys_zone=content_cache:100m max_size=3000m inactive=600m use_temp_path=off;
       # cache content metadata
       proxy_cache_path /tmp/content_metadata levels=1:2 keys_zone=content_metadata:100m max_size=1000m inactive=300m use_temp_path=off;
       
diff --git a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml
index cd2c2a701..39c76ee1a 100644
--- a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml
+++ b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml
@@ -60,30 +60,6 @@ spec:
         job_id: kafka
         alertname: TooManyKafkaProcessRunning
 
-    - alert: secor_process_not_running_critical
-      expr: namedprocess_namegroup_states{groupname="secor",state="Sleeping"} != {{ .Values.secor_job_count }}
-      for: 1m
-      labels:
-        severity: critical
-        module: dp_process
-      annotations:
-        message: Number of running processes should be {{ .Values.secor_job_count }} but currently {{`{{$value}}`}} processes are running.
-        summary: Secor process is not running
-        job_id: secor
-        alertname: SecorJobNotRunning
-
-    - alert: secor_process_not_running_critical
-      expr: namedprocess_namegroup_states{groupname="processingsecor",state="Sleeping"} != {{ .Values.processingsecor_job_count }}
-      for: 1m
-      labels:
-        severity: critical
-        module: dp_process
-      annotations:
-        message: Number of running processes should be {{ .Values.secor_job_count }} but currently {{`{{$value}}`}} processes are running.
-        summary: Secor process is not running
-        job_id: secor
-        alertname: SecorJobNotRunning
-
     - alert: zookeeper_process_not_running_fatal
       expr: namedprocess_namegroup_states{groupname="zookeeper",state="Sleeping"} < 1
       for: 1m
diff --git a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesSecorProcess.yml b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesSecorProcess.yml
new file mode 100644
index 000000000..0343e106e
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesSecorProcess.yml
@@ -0,0 +1,29 @@
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    role: alert-rules
+    app: {{ .Values.prometheus_rule_selector_app }}
+    release: {{ .Values.prometheus_rule_selector_release }}
+  name: {{ .Values.fullnameOverride }}-secor-process-rules
+  namespace: {{ .Values.namespace }}
+spec:
+  groups:
+  - name: alertrules.process
+    rules:
+    {{- if .Values.secor_process_names }}
+    ## druid segment unavailable count alert
+    {{ range $key := .Values.secor_process_names }}
+    - alert: secor_process_not_running_critical {{ . }}
+      expr: sum without(state) (namedprocess_namegroup_states{groupname={{ . | quote }}}) == 0
+      for: 5m
+      labels:
+        severity: critical
+        module: dp_process
+      annotations:
+        message: The secor job {{ . }} is not running.
+        job_id: {{ . }}
+        alertname: SecorJobNotRunning
+    {{- end }}
+    {{- end }} 
diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/nginx-detailed.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/nginx-detailed.json
index fbaea070b..a5bcfeb7c 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/dashboards/nginx-detailed.json
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/nginx-detailed.json
@@ -17,7 +17,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1601270090088,
+  "iteration": 1603867463241,
   "links": [],
   "panels": [
     {
@@ -188,19 +188,19 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "(sum(increase(nginx_http_requests_total{status!~\"4..|5..\"}[5m] offset 1d))  / sum(increase(nginx_http_requests_total[5m] ))) * 100",
+              "expr": "(sum(increase(nginx_http_requests_total{status!~\"4..|5..\"}[5m] ))  / sum(increase(nginx_http_requests_total[5m] ))) * 100",
               "interval": "",
               "legendFormat": "Today",
               "refId": "A"
             },
             {
-              "expr": "(sum(increase(nginx_http_requests_total{status!~\"4..|5..\"}[5m] offset 1d))  / sum(increase(nginx_http_requests_total[5m] offset 1w))) * 100",
+              "expr": "(sum(increase(nginx_http_requests_total{status!~\"4..|5..\"}[5m] offset 1d))  / sum(increase(nginx_http_requests_total[5m] offset 1d))) * 100",
               "interval": "",
               "legendFormat": "Yesteday",
               "refId": "B"
             },
             {
-              "expr": "(sum(increase(nginx_http_requests_total{status!~\"4..|5..\"}[5m] offset 1d))  / sum(increase(nginx_http_requests_total[5m] offset 1d))) * 100",
+              "expr": "(sum(increase(nginx_http_requests_total{status!~\"4..|5..\"}[5m] offset 1w))  / sum(increase(nginx_http_requests_total[5m] offset 1w))) * 100",
               "interval": "",
               "legendFormat": "Last Week",
               "refId": "C"
@@ -296,13 +296,13 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "(sum(increase(nginx_http_requests_total{ status!~\"2..|3..\"}[5m] offset 1w))  / sum(increase(nginx_http_requests_total[5m]))) * 100",
+              "expr": "(sum(increase(nginx_http_requests_total{ status!~\"2..|3..\"}[5m]))  / sum(increase(nginx_http_requests_total[5m]))) * 100",
               "interval": "",
               "legendFormat": "Today",
               "refId": "A"
             },
             {
-              "expr": "(sum(increase(nginx_http_requests_total{ status!~\"2..|3..\"}[5m] offset 1w))  / sum(increase(nginx_http_requests_total[5m] offset 1d))) * 100",
+              "expr": "(sum(increase(nginx_http_requests_total{ status!~\"2..|3..\"}[5m] offset 1d))  / sum(increase(nginx_http_requests_total[5m] offset 1d))) * 100",
               "interval": "",
               "legendFormat": "Yesterday",
               "refId": "B"
@@ -451,7 +451,7 @@
           "step": 2
         },
         {
-          "expr": "sum(rate(nginx_http_requests_total{cluster=~\"$cluster\", status=\"444\"}[5m]))",
+          "expr": "sum(rate(nginx_http_requests_total{cluster=~\"$cluster\", status=\"345\"}[5m]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1062,13 +1062,11 @@
       "legend": {
         "alignAsTable": true,
         "avg": false,
-        "current": true,
+        "current": false,
         "max": true,
         "min": false,
         "rightSide": true,
         "show": true,
-        "sort": "current",
-        "sortDesc": true,
         "total": false,
         "values": true
       },
@@ -1088,23 +1086,17 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(nginx_http_connections) by (instance)",
+          "expr": "sum(nginx_http_connections) by (state)",
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{ instance }}",
           "refId": "A"
-        },
-        {
-          "expr": "sum(nginx_http_connections)",
-          "interval": "",
-          "legendFormat": "Total",
-          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Nginx Total Connection",
+      "title": "Nginx Connections",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1120,7 +1112,7 @@
       },
       "yaxes": [
         {
-          "$$hashKey": "object:1799",
+          "$$hashKey": "object:142",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1129,7 +1121,7 @@
           "show": true
         },
         {
-          "$$hashKey": "object:1800",
+          "$$hashKey": "object:143",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1240,7 +1232,7 @@
       }
     }
   ],
-  "refresh": "1m",
+  "refresh": "5m",
   "schemaVersion": 25,
   "style": "dark",
   "tags": [],
@@ -1305,5 +1297,5 @@
   "timezone": "",
   "title": "Nginx Detailed",
   "uid": "9wKzPxZMz",
-  "version": 1
+  "version": 2
 }
diff --git a/pipelines/certs-templates/Jenkinsfile.upload b/pipelines/certs-templates/Jenkinsfile.upload
new file mode 100644
index 000000000..8b0ef0a6b
--- /dev/null
+++ b/pipelines/certs-templates/Jenkinsfile.upload
@@ -0,0 +1,61 @@
+@Library('deploy-conf') _
+node() {
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        stage("upload") {
+        def inputFile = input message: 'Upload file', parameters: [file(name: 'certUploadedfile')]
+        new hudson.FilePath(new File("tmp/certUploadedfile")).copyFrom(inputFile)
+        }
+
+        stage('checkout public repo') {
+            folder = new File("$WORKSPACE/.git")
+            if (folder.exists())
+            {
+               println "Found .git folder. Clearing it.."
+               sh'git clean -fxd'
+            }
+            checkout scm
+        }
+
+        ansiColor('xterm') {
+            stage('deploy'){
+                values = [:]
+                envDir = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-3].trim()
+                module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim()
+                jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
+                currentWs = sh(returnStdout: true, script: 'pwd').trim()
+                ansiblePlaybook = "${currentWs}/ansible/cert-file-upload.yml"
+                ansibleExtraArgs = "--extra-vars \"file_name=${params.file_name}\" --vault-password-file /var/lib/jenkins/secrets/vault-pass"
+                values.put('currentWs', currentWs)
+                values.put('env', envDir)
+                values.put('module', module)
+                values.put('jobName', jobName)
+                values.put('ansiblePlaybook', ansiblePlaybook)
+                values.put('ansibleExtraArgs', ansibleExtraArgs)
+                println values
+                ansible_playbook_run(values)
+                currentBuild.result = "SUCCESS"
+                currentBuild.description = "Artifact: ${values.artifact_version}, Private: ${params.private_branch}, Public: ${params.branch_or_tag}"
+             }
+        }
+
+        stage('remove tmp file'){
+             sh """
+                 rm -rf /tmp/certUploadedfile
+                """
+     }
+    }
+    catch (err) {
+        currentBuild.result = "FAILURE"
+        throw err
+    }
+    finally {
+        slack_notify(currentBuild.result)
+        email_notify()
+    }
+}

From bac360bd5abf1bc6cd7180839eca312601ce6d41 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 4 Nov 2020 12:58:06 +0530
Subject: [PATCH 024/184] Adding fluent-bit chart (#2019)

Adding type conversion for nginx logs
---
 .../roles/logging/templates/fluent-bit.yaml   |   27 +-
 .../logging/fluent-bit/.helmignore            |   23 +
 .../helm_charts/logging/fluent-bit/Chart.yaml |   42 +-
 .../helm_charts/logging/fluent-bit/OWNERS     |   10 -
 .../helm_charts/logging/fluent-bit/README.md  |  191 ---
 .../logging/fluent-bit/templates/NOTES.txt    |   15 -
 .../logging/fluent-bit/templates/_helpers.tpl |   90 +-
 .../fluent-bit/templates/cluster-role.yaml    |   28 -
 .../templates/cluster-rolebinding.yaml        |   19 -
 .../logging/fluent-bit/templates/config.yaml  |  271 ---
 .../fluent-bit/templates/configMap.yaml       |  166 ++
 .../fluent-bit/templates/daemonset.yaml       |  208 +--
 .../fluent-bit/templates/endpoint.yaml        |   27 +
 .../logging/fluent-bit/templates/psp.yaml     |   60 -
 .../logging/fluent-bit/templates/secret.yaml  |   30 -
 .../logging/fluent-bit/templates/service.yaml |   34 +-
 .../fluent-bit/templates/serviceMonitor.yaml  |   27 +
 .../fluent-bit/templates/serviceaccount.yaml  |   38 +-
 .../fluent-bit/templates/servicemonitor.yaml  |   34 -
 .../templates/tests/test-configmap.yaml       |   48 -
 .../fluent-bit/templates/tests/test.yaml      |   53 -
 .../logging/fluent-bit/values.yaml            |  354 +---
 .../dashboards/dashboards/fluent-bit.json     | 1509 +++++++++++++++++
 .../monitoring/dashboards/values.yaml         |    3 +
 24 files changed, 1973 insertions(+), 1334 deletions(-)
 create mode 100644 kubernetes/helm_charts/logging/fluent-bit/.helmignore
 mode change 100755 => 100644 kubernetes/helm_charts/logging/fluent-bit/Chart.yaml
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/OWNERS
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/README.md
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/NOTES.txt
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/cluster-role.yaml
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/cluster-rolebinding.yaml
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/config.yaml
 create mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
 create mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/endpoint.yaml
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/psp.yaml
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/secret.yaml
 create mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/serviceMonitor.yaml
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/servicemonitor.yaml
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/tests/test-configmap.yaml
 delete mode 100644 kubernetes/helm_charts/logging/fluent-bit/templates/tests/test.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/dashboards/dashboards/fluent-bit.json

diff --git a/kubernetes/ansible/roles/logging/templates/fluent-bit.yaml b/kubernetes/ansible/roles/logging/templates/fluent-bit.yaml
index f7bce5c1b..1d85dc620 100644
--- a/kubernetes/ansible/roles/logging/templates/fluent-bit.yaml
+++ b/kubernetes/ansible/roles/logging/templates/fluent-bit.yaml
@@ -1,24 +1,3 @@
-backend:
-  type: es
-  es:
-    host: {{ logger_es6_host }}
-    port: {{ logger_es_port }}
-    index: logstash-fb
-    type: flb_type
-    logstash_prefix: logstash-fb
-    replace_dots: "On"
-    logstash_format: "On"
-    retry_limit: "False"
-    time_key: "@timestamp"
-    # Optional username credential for Elastic X-Pack access
-    http_user:
-    # Password for user defined in HTTP_User
-    http_passwd:
-    # Optional TLS encryption to ElasticSearch instance
-    tls: "off"
-    tls_verify: "on"
-    # TLS certificate for the Elastic (in PEM format). Use if tls=on and tls_verify=on.
-    tls_ca: ""
-    # TLS debugging levels = 1-4
-    tls_debug: 1
-
+es:
+  endpoint: true
+  ips: {{groups['log-es'] | to_json}}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/.helmignore b/kubernetes/helm_charts/logging/fluent-bit/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/kubernetes/helm_charts/logging/fluent-bit/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/kubernetes/helm_charts/logging/fluent-bit/Chart.yaml b/kubernetes/helm_charts/logging/fluent-bit/Chart.yaml
old mode 100755
new mode 100644
index 2aaf9640d..47ff4d0df
--- a/kubernetes/helm_charts/logging/fluent-bit/Chart.yaml
+++ b/kubernetes/helm_charts/logging/fluent-bit/Chart.yaml
@@ -1,21 +1,23 @@
-apiVersion: v1
+apiVersion: v2
 name: fluent-bit
-version: 2.8.12
-appVersion: 1.3.7
-description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX
-keywords:
-- logging
-- monitoring
-- fluent
-- fluentd
-sources:
-- https://fluentbit.io
-icon: https://fluentbit.io/assets/img/logo1-default.png
-home: https://fluentbit.io
-maintainers:
-- name: kfox1111
-  email: Kevin.Fox@pnnl.gov
-- name: edsiper
-  email: eduardo@treasure-data.com
-- name: hectorj2f
-  email: hfernandez@mesosphere.com
+description: Fluentbit logging helm
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+appVersion: 1.6.3
diff --git a/kubernetes/helm_charts/logging/fluent-bit/OWNERS b/kubernetes/helm_charts/logging/fluent-bit/OWNERS
deleted file mode 100644
index fa1f0128d..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/OWNERS
+++ /dev/null
@@ -1,10 +0,0 @@
-approvers:
-- kfox1111
-- edsiper
-- hectorj2f
-- Towmeykaw
-reviewers:
-- kfox1111
-- edsiper
-- hectorj2f
-- Towmeykaw
diff --git a/kubernetes/helm_charts/logging/fluent-bit/README.md b/kubernetes/helm_charts/logging/fluent-bit/README.md
deleted file mode 100644
index 2ece5deed..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/README.md
+++ /dev/null
@@ -1,191 +0,0 @@
-# Fluent-Bit Chart
-
-[Fluent Bit](http://fluentbit.io/) is an open source and multi-platform Log Forwarder.
-
-## Chart Details
-
-This chart will do the following:
-
-* Install a configmap for Fluent Bit
-* Install a daemonset that provisions Fluent Bit [per-host architecture]
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```bash
-$ helm install --name my-release stable/fluent-bit
-```
-
-When installing this chart on [Minikube](https://kubernetes.io/docs/getting-started-guides/minikube/), it's required to specify that so the DaemonSet will be able to mount the log files properly, make sure to append the _--set on\_minikube=true_ option at the end of the _helm_ command, e.g:
-
-```bash
-$ helm install --name my-release stable/fluent-bit --set on_minikube=true
-```
-
-## Configuration
-
-The following table lists the configurable parameters of the Fluent-Bit chart and the default values.
-
-| Parameter                  | Description                        | Default                 |
-| -----------------------    | ---------------------------------- | ----------------------- |
-| **Backend Selection**      |
-| `backend.type`             | Set the backend to which Fluent-Bit should flush the information it gathers | `forward` |
-| **Forward Backend**        |
-| `backend.forward.host`     | Target host where Fluent-Bit or Fluentd are listening for Forward messages | `fluentd` |
-| `backend.forward.port`     | TCP Port of the target service | `24284` |
-| `backend.forward.shared_key`       | A key string known by the remote Fluentd used for authorization. | `` |
-| `backend.forward.tls`              | Enable or disable TLS support | `off` |
-| `backend.forward.tls_verify`       | Force certificate validation  | `on` |
-| `backend.forward.tls_debug`        | Set TLS debug verbosity level. It accept the following values: 0-4 | `1` |
-| **ElasticSearch Backend**  |
-| `backend.es.host`          | IP address or hostname of the target Elasticsearch instance | `elasticsearch` |
-| `backend.es.port`          | TCP port of the target Elasticsearch instance. | `9200` |
-| `backend.es.index`         | Elastic Index name | `kubernetes_cluster` |
-| `backend.es.type`          | Elastic Type name | `flb_type` |
-| `backend.es.retry_limit`   | Max number of retries to attempt (False == no limit) | `False` |
-| `backend.es.time_key`          | Elastic Time Key | `@timestamp` |
-| `backend.es.logstash_format`          | Enable Logstash format compatibility. | `On` |
-| `backend.es.logstash_prefix`  | Index Prefix. If Logstash_Prefix is equal to 'mydata' your index will become 'mydata-YYYY.MM.DD'. | `kubernetes_cluster` |
-| `backend.es.logstash_prefix_key`  | Index Prefix key. When included, the value in the record that belongs to the key will be looked up and overwrite `Logstash_Prefix` for index generation. If `Logstash_Prefix_Key` = 'mydata' the index becomes 'mydata-YYYY.MM.DD'. | `` |
-| `backend.es.replace_dots`     | Enable/Disable Replace_Dots option. | `On` |
-| `backend.es.http_user`        | Optional username credential for Elastic X-Pack access. | `` |
-| `backend.es.http_passwd`      | Password for user defined in HTTP_User. | `` |
-| `backend.es.http_passwd_secret`     | Secret name for password for user defined in HTTP_User. | `` |
-| `backend.es.http_passwd_secret_key` | Secret key for password for user defined in HTTP_User. | `` |
-| `backend.es.tls`              | Enable or disable TLS support | `off` |
-| `backend.es.tls_verify`       | Force certificate validation  | `on` |
-| `backend.es.tls_secret`        | Existing secret storing TLS CA certificate for the Elastic instance. Specify if tls: on. Overrides `backend.es.tls_ca` | `` |
-| `backend.es.tls_secret_ca_key` | Existing secret key storing TLS CA certificate for the Elastic instance. Specify if tls: on.                           | `` |
-| `backend.es.tls_ca`           | TLS CA certificate for the Elastic instance (in PEM format). Specify if tls: on. | `` |
-| `backend.es.tls_debug`        | Set TLS debug verbosity level. It accept the following values: 0-4 | `1` |
-| **HTTP Backend**              |
-| `backend.http.host`           | IP address or hostname of the target HTTP Server | `127.0.0.1` |
-| `backend.http.port`           | TCP port of the target HTTP Server | `80` |
-| `backend.http.uri`            | Specify an optional HTTP URI for the target web server, e.g: /something | `"/"`
-| `backend.http.http_user`        | Optional username credential for Basic Authentication. | `` |
-| `backend.http.http_passwd:`     | Password for user defined in HTTP_User. | `` |
-| `backend.http.format`         | Specify the data format to be used in the HTTP request body, by default it uses msgpack, optionally it can be set to json.  | `msgpack` |
-| `backend.http.json_date_format`         | Specify the format of the date. Supported formats are double and iso8601 | `double` |
-| `backend.http.headers`          | HTTP Headers | `[]` |
-| `backend.http.tls`              | Enable or disable TLS support | `off` |
-| `backend.http.tls_verify`       | Force certificate validation  | `on` |
-| `backend.http.tls_debug`        | Set TLS debug verbosity level. It accept the following values: 0-4 | `1` |
-| **Splunk Backend**              |
-| `backend.splunk.host`           | IP address or hostname of the target Splunk Server | `127.0.0.1` |
-| `backend.splunk.port`           | TCP port of the target Splunk Server | `8088` |
-| `backend.splunk.token`            | Specify the Authentication Token for the HTTP Event Collector interface. | `` |
-| `backend.splunk.send_raw`         | If enabled, record keys and values are set in the main map. | `off` |
-| `backend.splunk.tls`           | Enable or disable TLS support | `on` |
-| `backend.splunk.tls_verify`           | Force TLS certificate validation | `off` |
-| `backend.splunk.tls_debug`        | Set TLS debug verbosity level. It accept the following values: 0-4 | `1` |
-| `backend.splunk.message_key`           | Tag applied to all incoming logs | `kubernetes` |
-| **Stackdriver Backend**              |
-| `backend.stackdriver.google_service_credentials`           | Contents of a Google Cloud credentials JSON file. | `` |
-| `backend.stackdriver.service_account_email`           | Account email associated to the service. Only available if no credentials file has been provided. | `` |
-| `backend.stackdriver.service_account_secret`            | Private key content associated with the service account. Only available if no credentials file has been provided. | `` |
-| **Parsers**                   |
-| `parsers.enabled`                  | Enable custom parsers | `false` |
-| `parsers.regex`                    | List of regex parsers | `NULL` |
-| `parsers.json`                     | List of json parsers | `NULL` |
-| `parsers.logfmt`                   | List of logfmt parsers | `NULL` |
-| **General**                   |
-| `annotations`                      | Optional deamonset set annotations                      | `NULL`                              |
-| `audit.enable`                     | Enable collection of audit logs                         | `false`                             |
-| `audit.input.memBufLimit`          | Specify Mem_Buf_Limit in tail input                     | `35mb`                              |
-| `audit.input.parser`               | Specify Parser in tail input                            | `docker`                            |
-| `audit.input.tag`                  | Specify Tag in tail input                               | `audit.*`                           |
-| `audit.input.path`                 | Specify log file(s) through the use of common wildcards | `/var/log/kube-apiserver-audit.log` |
-| `audit.input.bufferChunkSize`      | Specify Buffer_Chunk_Size in tail                       | `2MB`                               |
-| `audit.input.bufferMaxSize`        | Specify Buffer_Max_Size in tail                         | `10MB`                              |
-| `audit.input.skipLongLines`        | Specify Skip_Long_Lines in tail                         | `On`                                |
-| `audit.input.key`                  | Specify Key in tail                                     | `kubernetes-audit`                             |
-| `podAnnotations`                   | Optional pod annotations                  | `NULL`                |
-| `podLabels`                        | Optional pod labels                       | `NULL`                |
-| `fullConfigMap`                    | User has provided entire config (parsers + system)  | `false`      |
-| `existingConfigMap`                | ConfigMap override                         | ``                    |
-| `extraEntries.input`               |    Extra entries for existing [INPUT] section                     | ``                    |
-| `extraEntries.filter`              |    Extra entries for existing [FILTER] section                     | ``                    |
-| `extraEntries.output`              |   Extra entries for existing [OUPUT] section                     | ``                    |
-| `extraPorts`                       | List of extra ports                        |                       |
-| `extraVolumeMounts`                | Mount an extra volume, required to mount ssl certificates when elasticsearch has tls enabled |          |
-| `extraVolume`                      | Extra volume                               |                                                |
-| `service.flush`                    | Interval to flush output (seconds)        | `1`                   |
-| `service.logLevel`                 | Diagnostic level (error/warning/info/debug/trace)        | `info`                   |
-| `filter.enableExclude`             | Enable the use of monitoring for a pod annotation of `fluentbit.io/exclude: true`. If present, discard logs from that pod.         | `true`                                 |
-| `filter.enableParser`              | Enable the use of monitoring for a pod annotation of `fluentbit.io/parser: parser_name`. parser_name must be the name of a parser contained within parsers.conf         | `true`                                 |
-| `filter.kubeURL`                   | Optional custom configmaps                 | `https://kubernetes.default.svc:443`            |
-| `filter.kubeCAFile`                | Optional custom configmaps       | `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`    |
-| `filter.kubeTokenFile`             | Optional custom configmaps       | `/var/run/secrets/kubernetes.io/serviceaccount/token`     |
-| `filter.kubeTag`                   | Optional top-level tag for matching in filter         | `kube`                                 |
-| `filter.kubeTagPrefix`             | Optional tag prefix used by Tail   | `kube.var.log.containers.`                                |
-| `filter.mergeJSONLog`              | If the log field content is a JSON string map, append the map fields as part of the log structure         | `true`                                 |
-| `filter.mergeLogKey`               | If set, append the processed log keys under a new root key specified by this variable. | `nil` |
-| `filter.useJournal`                | If true, the filter reads logs coming in Journald format.  | `false` |
-| `image.fluent_bit.repository`      | Image                                      | `fluent/fluent-bit`                               |
-| `image.fluent_bit.tag`             | Image tag                                  | `1.3.7`                                           |
-| `image.pullPolicy`                 | Image pull policy                          | `Always`                                          |
-| `nameOverride`                     | Override name of app                   | `nil`                                        |
-| `fullnameOverride`                 | Override full name of app              | `nil`                                        |
-| `image.pullSecrets`                | Specify image pull secrets                 | `nil`                                             |
-| `input.tail.memBufLimit`           | Specify Mem_Buf_Limit in tail input        | `5MB`                                             |
-| `input.tail.parser`                | Specify Parser in tail input.        | `docker`                                             |
-| `input.tail.path`                  | Specify log file(s) through the use of common wildcards.        | `/var/log/containers/*.log`                                             |
-| `input.tail.ignore_older`          | Ignores files that have been last modified before this time in seconds. Supports m,h,d (minutes, hours,days) syntax.        | ``                                             |
-| `input.systemd.enabled`            | [Enable systemd input](https://docs.fluentbit.io/manual/input/systemd)                   | `false`                                       |
-| `input.systemd.filters.systemdUnit` | Please see https://docs.fluentbit.io/manual/input/systemd | `[docker.service, kubelet.service`, `node-problem-detector.service]`                                       |
-| `input.systemd.maxEntries`         | Please see https://docs.fluentbit.io/manual/input/systemd | `1000`                             |
-| `input.systemd.readFromTail`       | Please see https://docs.fluentbit.io/manual/input/systemd | `true`                             |
-| `input.systemd.stripUnderscores`       | Please see https://docs.fluentbit.io/manual/input/systemd | `false`                             |
-| `input.systemd.tag`                | Please see https://docs.fluentbit.io/manual/input/systemd | `host.*`                           |
-| `rbac.create`                      | Specifies whether RBAC resources should be created.   | `true`                                 |
-| `rbac.pspEnabled`                  | Specifies whether a PodSecurityPolicy should be created. | `false`                             |
-| `serviceAccount.create`            | Specifies whether a ServiceAccount should be created. | `true`                                 |
-| `serviceAccount.name`              | The name of the ServiceAccount to use.     | `NULL`                                            |
-| `serviceAccount.annotations`       | Annotations to add to the service account. | `{}`                                              |
-| `rawConfig`                        | Raw contents of fluent-bit.conf            | `@INCLUDE fluent-bit-service.conf`<br>`@INCLUDE fluent-bit-input.conf`<br>`@INCLUDE fluent-bit-filter.conf`<br>` @INCLUDE fluent-bit-output.conf`                                                                         |
-| `resources`                        | Pod resource requests & limits                                 | `{}`                          |
-| `securityContext`                  | [Security settings for a container](https://kubernetes.io/docs/concepts/policy/security-context) | `{}` |
-| `podSecurityContext`               | [Security settings for a pod](https://kubernetes.io/docs/concepts/policy/security-context)       | `{}` |
-| `hostNetwork`                      | Use host's network                         | `false`                                           |
-| `dnsPolicy`                        | Specifies the dnsPolicy to use             | `ClusterFirst`                                    |
-| `priorityClassName`                | Specifies the priorityClassName to use     | `NULL`                                            |
-| `tolerations`                      | Optional daemonset tolerations             | `NULL`                                            |
-| `nodeSelector`                     | Node labels for fluent-bit pod assignment  | `NULL`                                            |
-| `affinity`                         | Expressions for affinity                   | `NULL`                                            |
-| `metrics.enabled`                  | Specifies whether a service for metrics should be exposed | `false`                            |
-| `metrics.service.annotations`      | Optional metrics service annotations       | `NULL`                                            |
-| `metrics.service.labels`           | Additional labels for the fluent-bit metrics service definition, specified as a map.                                                    | None                                              |
-| `metrics.service.port`             | Port on where metrics should be exposed    | `2020`                                            |
-| `metrics.service.type`             | Service type for metrics                   | `ClusterIP`                                       |
-| `metrics.serviceMonitor.enabled`          | Set this to `true` to create ServiceMonitor for Prometheus operator                   | `false` |
-| `metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}`    |
-| `metrics.serviceMonitor.namespace`        | Optional namespace in which to create ServiceMonitor                                  | `nil`   |
-| `metrics.serviceMonitor.interval`         | Scrape interval. If not set, the Prometheus default scrape interval is used           | `nil`   |
-| `metrics.serviceMonitor.scrapeTimeout`    | Scrape timeout. If not set, the Prometheus default scrape timeout is used             | `nil`   |
-| `trackOffsets`                     | Specify whether to track the file offsets for tailing docker logs. This allows fluent-bit to pick up where it left after pod restarts but requires access to a `hostPath` | `false` |
-| `testFramework.image`              | `test-framework` image repository.         | `dduportal/bats`                                  |
-| `testFramework.tag`                | `test-framework` image tag.                | `0.4.0`                                           |
-
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
-
-Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
-
-```bash
-$ helm install --name my-release -f values.yaml stable/fluent-bit
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
-
-## Upgrading
-
-### From < 1.0.0 To >= 1.0.0
-
-Values `extraInputs`, `extraFilters` and `extraOutputs` have been removed in version `1.0.0` of the fluent-bit chart.
-To add additional entries to the existing sections, please use the `extraEntries.input`, `extraEntries.filter` and `extraEntries.output` values.
-For entire sections, please use the `rawConfig` value, inserting blocks of text as desired.
-
-### From < 1.8.0 to >= 1.8.0
-
-Version `1.8.0` introduces the use of release name as full name if it contains the chart name(fluent-bit in this case). E.g. with a release name of `fluent-bit`, this renames the DaemonSet from `fluent-bit-fluent-bit` to `fluent-bit`. The suggested approach is to delete the release and reinstall it.
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/NOTES.txt b/kubernetes/helm_charts/logging/fluent-bit/templates/NOTES.txt
deleted file mode 100644
index bbfcc0bef..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-fluent-bit is now running.
-
-{{- if eq .Values.backend.type "forward" }}
-
-It will forward all container logs to the svc named {{ .Values.backend.forward.host }} on port: {{ .Values.backend.forward.port }}
-{{- else if eq .Values.backend.type "es" }}
-
-It will forward all container logs to the svc named {{ .Values.backend.es.host }} on port: {{ .Values.backend.es.port }}
-{{- else if eq .Values.backend.type "http" }}
-
-It will forward all container logs to the svc named {{ .Values.backend.http.host }} on port: {{ .Values.backend.http.port }}
-{{- else if eq .Values.backend.type "splunk" }}
-
-It will forward all container logs to the svc named {{ .Values.backend.splunk.host }} on port: {{ .Values.backend.splunk.port }}
-{{- end }}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/_helpers.tpl b/kubernetes/helm_charts/logging/fluent-bit/templates/_helpers.tpl
index e9159a050..189773ee5 100644
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/_helpers.tpl
+++ b/kubernetes/helm_charts/logging/fluent-bit/templates/_helpers.tpl
@@ -1,10 +1,9 @@
-{{/* vim: set filetype=mustache: */}}
 {{/*
 Expand the name of the chart.
 */}}
 {{- define "fluent-bit.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
 
 {{/*
 Create a default fully qualified app name.
@@ -12,67 +11,52 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "fluent-bit.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
 
 {{/*
 Create chart name and version as used by the chart label.
 */}}
 {{- define "fluent-bit.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
 
 {{/*
-Return the appropriate apiVersion for RBAC APIs.
+Common labels
 */}}
-{{- define "rbac.apiVersion" -}}
-{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" -}}
-rbac.authorization.k8s.io/v1
-{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1beta1" -}}
-rbac.authorization.k8s.io/v1beta1
-{{- else -}}
-rbac.authorization.k8s.io/v1alpha1
-{{- end -}}
-{{- end -}}
+{{- define "fluent-bit.labels" -}}
+helm.sh/chart: {{ include "fluent-bit.chart" . }}
+{{ include "fluent-bit.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
 
 {{/*
-Create the name of the service account to use
+Selector labels
 */}}
-{{- define "fluent-bit.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "fluent-bit.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
+{{- define "fluent-bit.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "fluent-bit.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
 
 {{/*
-Return the appropriate apiGroup for PodSecurityPolicy.
-*/}}
-{{- define "rbac.pspApiGroup" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "extensions" -}}
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "policy" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the appropriate apiVersion for DaemonSet.
+Create the name of the service account to use
 */}}
-{{- define "daemonSet.apiVersion" -}}
-{{- if semverCompare "<1.9-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "extensions/v1beta1" -}}
-{{- else -}}
-{{- print "apps/v1" -}}
-{{- end -}}
-{{- end -}}
+{{- define "fluent-bit.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "fluent-bit.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/cluster-role.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/cluster-role.yaml
deleted file mode 100644
index 69c79891d..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/cluster-role.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{- if .Values.rbac.create -}}
-apiVersion: {{ template "rbac.apiVersion" . }}
-kind: ClusterRole
-metadata:
-  labels:
-    app: {{ template "fluent-bit.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "fluent-bit.fullname" . }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-    verbs:
-      - get
-{{- if .Values.rbac.pspEnabled }}
-  - apiGroups:
-    - {{ template "rbac.pspApiGroup" . }}
-    resources:
-    - podsecuritypolicies
-    resourceNames:
-    - {{ template "fluent-bit.fullname" . }}
-    verbs:
-    - use
-{{- end }}
-{{- end -}}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/cluster-rolebinding.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/cluster-rolebinding.yaml
deleted file mode 100644
index 140e5279b..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/cluster-rolebinding.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- if .Values.rbac.create -}}
-apiVersion: {{ template "rbac.apiVersion" . }}
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app: {{ template "fluent-bit.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "fluent-bit.fullname" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ template "fluent-bit.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "fluent-bit.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end -}}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/config.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/config.yaml
deleted file mode 100644
index 37bba568f..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/config.yaml
+++ /dev/null
@@ -1,271 +0,0 @@
-{{- if (empty .Values.existingConfigMap) -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "fluent-bit.fullname" . }}-config
-  labels:
-    app: {{ template "fluent-bit.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-data:
-  fluent-bit-service.conf: |
-    [SERVICE]
-        Flush        {{ .Values.service.flush }}
-        Daemon       Off
-        Log_Level    {{ .Values.service.logLevel }}
-        Parsers_File parsers.conf
-{{- if .Values.parsers.enabled }}
-        Parsers_File parsers_custom.conf
-{{- end }}
-{{- if .Values.metrics.enabled }}
-        HTTP_Server  On
-        HTTP_Listen  0.0.0.0
-        HTTP_Port    2020
-{{- end }}
-
-  fluent-bit-input.conf: |
-    [INPUT]
-        Name             tail
-        Path             {{ .Values.input.tail.path }}
-        Parser           {{ .Values.input.tail.parser }}
-        Tag              {{ .Values.filter.kubeTag }}.*
-        Refresh_Interval 5
-        Mem_Buf_Limit    {{ .Values.input.tail.memBufLimit }}
-        Skip_Long_Lines  On
-{{- if .Values.input.tail.ignore_older }}
-        Ignore_Older    {{ .Values.input.tail.ignore_older }}
-{{- end }}
-{{- if .Values.trackOffsets }}
-        DB               /tail-db/tail-containers-state.db
-        DB.Sync          Normal
-{{- end }}
-{{- if .Values.input.systemd.enabled }}
-    [INPUT]
-        Name            systemd
-        Tag             {{ .Values.input.systemd.tag }}
-{{- range $value := .Values.input.systemd.filters.systemdUnit }}
-        Systemd_Filter  _SYSTEMD_UNIT={{ $value }}
-{{- end }}
-        Max_Entries     {{ .Values.input.systemd.maxEntries }}
-        Read_From_Tail  {{ .Values.input.systemd.readFromTail }}
-        Strip_Underscores  {{ .Values.input.systemd.stripUnderscores }}
-{{- end }}
-{{ .Values.extraEntries.input | indent 8 }}
-
-{{- if .Values.audit.enable }}
-    [INPUT]
-        Name              tail
-        Path              {{ .Values.audit.input.path }}
-        Parser            {{ .Values.audit.input.parser }}
-        DB                /var/log/audit.db
-        Tag               {{ .Values.audit.input.tag }}
-        Refresh_Interval  5
-        Mem_Buf_Limit     {{ .Values.audit.input.memBufLimit }}
-        Buffer_Chunk_Size {{ .Values.audit.input.bufferChunkSize }}
-        Buffer_Max_Size   {{ .Values.audit.input.bufferMaxSize }}
-        Skip_Long_Lines   {{ .Values.audit.input.skipLongLines}}
-        Key               {{ .Values.audit.input.key}}
-{{ .Values.extraEntries.audit | indent 8 }}
-{{- end }}
-
-  fluent-bit-filter.conf: |
-    [FILTER]
-        Name                kubernetes
-        Match               {{ .Values.filter.kubeTag }}.*
-        Kube_Tag_Prefix     {{ .Values.filter.kubeTagPrefix }}
-        Kube_URL            {{ .Values.filter.kubeURL }}
-        Kube_CA_File        {{ .Values.filter.kubeCAFile }}
-        Kube_Token_File     {{ .Values.filter.kubeTokenFile }}
-{{- if .Values.filter.mergeJSONLog }}
-        Merge_Log           On
-{{- end }}
-
-{{- if .Values.filter.mergeLogKey }}
-        Merge_Log_Key       {{ .Values.filter.mergeLogKey }}
-{{- end }}
-
-{{- if .Values.filter.enableParser }}
-        K8S-Logging.Parser  On
-{{- end }}
-{{- if .Values.filter.enableExclude }}
-        K8S-Logging.Exclude On
-{{- end }}
-{{- if .Values.filter.useJournal }}
-        Use_Journal         On
-{{- end }}
-{{ .Values.extraEntries.filter | indent 8 }}
-
-  fluent-bit-output.conf: |
-{{ if eq .Values.backend.type "test" }}
-    [OUTPUT]
-        Name  file
-        Match *
-        Path /tmp/fluent-bit.log
-{{ else if eq .Values.backend.type "forward" }}
-    [OUTPUT]
-        Name          forward
-        Match         *
-        Host          {{ .Values.backend.forward.host }}
-        Port          {{ .Values.backend.forward.port }}
-        Retry_Limit False
-{{- if .Values.backend.forward.shared_key }}
-        Shared_Key    {{ .Values.backend.forward.shared_key }}
-{{- end }}
-{{- if .Values.backend.forward.tls }}
-        tls           {{ .Values.backend.forward.tls }}
-{{- end }}
-{{- if .Values.backend.forward.tls_verify }}
-        tls.verify    {{ .Values.backend.forward.tls_verify }}
-{{- end }}
-{{- if .Values.backend.forward.tls_debug }}
-        tls.debug     {{ .Values.backend.forward.tls_debug }}
-{{- end }}
-{{ else if eq .Values.backend.type "es" }}
-    [OUTPUT]
-        Name  es
-        Match *
-        Host  {{ .Values.backend.es.host }}
-        Port  {{ .Values.backend.es.port }}
-        Logstash_Format {{ default "On" .Values.backend.es.logstash_format  }}
-        Retry_Limit {{ .Values.backend.es.retry_limit }}
-        Type  {{ .Values.backend.es.type }}
-{{- if .Values.backend.es.time_key }}
-        Time_Key {{ .Values.backend.es.time_key }}
-{{- end }}
-{{- if .Values.backend.es.replace_dots }}
-        Replace_Dots {{ .Values.backend.es.replace_dots }}
-{{- end }}
-{{- if .Values.backend.es.logstash_prefix }}
-        Logstash_Prefix {{ .Values.backend.es.logstash_prefix }}
-{{- if .Values.backend.es.logstash_prefix_key }}
-        Logstash_Prefix_Key {{ .Values.backend.es.logstash_prefix_key }}
-{{- end }}
-{{ else if .Values.backend.es.index }}
-        Index {{ .Values.backend.es.index }}
-{{- end }}
-{{- if .Values.backend.es.http_user }}
-        HTTP_User {{ .Values.backend.es.http_user }}
-{{- if .Values.backend.es.http_passwd }}
-        HTTP_Passwd {{ .Values.backend.es.http_passwd }}
-{{- else }}
-        HTTP_Passwd ${HTTP_PASSWORD}
-{{- end }}
-{{- end }}
-{{if eq .Values.backend.es.tls "on" }}
-        tls {{ .Values.backend.es.tls }}
-        tls.verify {{ .Values.backend.es.tls_verify }}
-        tls.debug {{ .Values.backend.es.tls_debug }}
-{{- if .Values.backend.es.tls_ca }}
-        tls.ca_file /secure/es-tls-ca.crt
-{{- end }}
-{{- end }}
-{{ else if eq .Values.backend.type "splunk" }}
-    [OUTPUT]
-        Name  splunk
-        Match *
-        Host  {{ .Values.backend.splunk.host }}
-        Port  {{ .Values.backend.splunk.port }}
-        Splunk_Token  {{ .Values.backend.splunk.token }}
-        Splunk_Send_Raw {{ .Values.backend.splunk.send_raw}}
-        TLS   {{ .Values.backend.splunk.tls }}
-        TLS.Verify   {{ .Values.backend.splunk.tls_verify }}
-        tls.debug {{ .Values.backend.splunk.tls_debug }}
-        Message_Key   {{ .Values.backend.splunk.message_key }}
-{{ else if eq .Values.backend.type "stackdriver" }}
-    [OUTPUT]
-        Name  stackdriver
-        Match *
-        resource global
-{{- if .Values.backend.stackdriver.google_service_credentials }}
-        google_service_credentials /secure/google_service_credentials.json
-{{- else }}
-        service_account_email  {{ .Values.backend.stackdriver.service_account_email }}
-        service_account_secret  {{ .Values.backend.stackdriver.service_account_secret }}
-{{- end }}
-{{ else if eq .Values.backend.type "http" }}
-    [OUTPUT]
-        Name  http
-        Match *
-        Host {{ .Values.backend.http.host }}
-        Port {{ .Values.backend.http.port }}
-        URI {{ .Values.backend.http.uri }}
-{{- if .Values.backend.http.http_user }}
-        HTTP_User {{ .Values.backend.http.http_user }}
-        HTTP_Passwd {{ .Values.backend.http.http_passwd }}
-{{- end }}
-        tls {{ .Values.backend.http.tls }}
-        tls.verify {{ .Values.backend.http.tls_verify }}
-        tls.debug {{ .Values.backend.http.tls_debug }}
-{{- if .Values.backend.http.proxy }}
-        Proxy {{ .Values.backend.http.proxy }}
-{{- end }}
-        Format {{ .Values.backend.http.format }}
-{{- end }}
-{{- if .Values.backend.http.json_date_format }}
-        json_date_format {{ .Values.backend.http.json_date_format }}
-{{- end }}
-{{- range  .Values.backend.http.headers }}
-        Header  {{ . }}
-{{- end }}
-{{ .Values.extraEntries.output | indent 8 }}
-
-
-  fluent-bit.conf: |
-{{ .Values.rawConfig | indent 4 }}
-
-  parsers.conf: |
-{{- if .Values.parsers.regex }}
-{{- range .Values.parsers.regex }}
-    [PARSER]
-        Name        {{ .name }}
-        Format      regex
-        Regex       {{ .regex }}
-{{- if .timeKey }}
-        Time_Key    {{ .timeKey }}
-{{- end }}
-{{- if .timeFormat }}
-        Time_Format {{ .timeFormat }}
-{{- end }}
-{{ end }}
-{{- end }}
-{{- if .Values.parsers.json }}
-{{- range .Values.parsers.json }}
-    [PARSER]
-        Name        {{ .name }}
-        Format      json
-{{- if .timeKeep }}
-        Time_Keep   {{ .timeKeep }}
-{{- end }}
-{{- if .timeKey }}
-        Time_Key    {{ .timeKey }}
-{{- end }}
-{{- if .timeFormat }}
-        Time_Format {{ .timeFormat }}
-{{- end }}
-{{- if .decodeFieldAs  }}
-        Decode_Field_As {{ .decodeFieldAs }} {{ .decodeField | default "log" }}
-{{- end}}
-{{- if .extraEntries }}
-{{ .extraEntries | indent 8 }}
-{{- end }}
-{{ end }}
-{{- end }}
-{{- if .Values.parsers.logfmt }}
-{{- range .Values.parsers.logfmt }}
-    [PARSER]
-        Name        {{ .name }}
-        Format      logfmt
-{{- if .timeKey }}
-        Time_Key    {{ .timeKey }}
-{{- end }}
-{{- if .timeFormat }}
-        Time_Format {{ .timeFormat }}
-{{- end }}
-{{- if .extraEntries }}
-{{ .extraEntries | indent 8 }}
-{{- end }}
-{{ end }}
-{{- end }}
-
-{{- end -}}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
new file mode 100644
index 000000000..010761e6e
--- /dev/null
+++ b/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
@@ -0,0 +1,166 @@
+---
+apiVersion: v1
+data:
+  filter-kubernetes.conf: |
+    [FILTER]
+        Name                kubernetes
+        Match               kube.*
+        Kube_URL            https://kubernetes.default.svc:443
+        Kube_CA_File        /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+        Kube_Token_File     /var/run/secrets/kubernetes.io/serviceaccount/token
+        Kube_Tag_Prefix     kube.var.log.containers.
+        # Merge application log to kubernetes structure
+        Merge_Log           On
+        # Disabling merge key as all the fileds will be in the root
+        # Else all merged content will be under 
+        # log_processed:
+        #    {
+        #    }
+        # Merge_Log_Key       log_processed
+        #
+        # Adding custom parsor not to do any json parse
+        Merge_Parser        catchall
+        # Don't need merged logs
+        # More over, we're using custom parser, which catch all and tag it as log
+        Keep_Log            Off
+        # Annotate pod to select the parser
+        # annotaions:
+        #   fluentbit.io/parsers: nginx2
+        K8S-Logging.Parser  On
+        # Disable fluent-bit from parsing logs
+        # annotaions:
+        #   fluentbit.io/exclude: true
+        K8S-Logging.Exclude On
+    [FILTER]
+        # Discard all health debug and info logs
+        Name grep
+        Match kube.*
+        exclude message /^.*(?:debug|info|GET (\/service)?\/health).*$
+
+  fluent-bit.conf: |
+    [SERVICE]
+        Flush         1
+        Log_Level     WARNING
+        Daemon        off
+        Parsers_File  parsers.conf
+        HTTP_Server   On
+        HTTP_Listen   0.0.0.0
+        HTTP_Port     2020
+        storage.path              /mnt/log/flb-storage/
+        storage.sync              normal
+        storage.checksum          off
+        storage.backlog.mem_limit 120M
+        # How many chunks from file system, which is in que to flush to es, has to be in memory(warm)
+        storage.max_chunks_up 50
+
+    @INCLUDE input-kubernetes.conf
+    @INCLUDE filter-kubernetes.conf
+    @INCLUDE output-elasticsearch.conf
+  input-kubernetes.conf: |
+    [INPUT]
+        Name              tail
+        Tag               kube.*
+        Path              /var/log/containers/*.log
+        Parser            docker
+        DB                /mnt/log/flb_kube.db
+        Mem_Buf_Limit     120MB
+        # Set the initial buffer size to read files data.
+        # This value is used too to increase buffer size.
+        Buffer_Chunk_Size 256k
+        # Set the limit of the buffer size per monitored file.
+        # When a buffer needs to be increased (e.g: very long lines),
+        # this value is used to restrict how much the memory buffer can grow.
+        # If reading a file exceed this limit, the file is removed from the monitored file list
+        Buffer_Max_Size   512k
+        Skip_Long_Lines   On
+        Refresh_Interval  1
+        storage.type  filesystem
+        # Ignore older logs of 30m
+        Ignore_Older       30m
+  output-elasticsearch.conf: |
+    [OUTPUT]
+        Name            es
+        Match           *
+        Host            ${FLUENT_ELASTICSEARCH_HOST}
+        Port            ${FLUENT_ELASTICSEARCH_PORT}
+        Logstash_Format On
+        Replace_Dots    On
+        Retry_Limit     10
+        Type            _doc
+        # Networking Setup
+        net.connect_timeout         10
+        # net.source_address          127.0.0.1
+        net.keepalive               on
+        net.keepalive_idle_timeout  100
+        net.keepalive_max_recycle 200
+        #
+        # Limit the maximum number of Chunks in the filesystem for the current output logical destination.
+        # After this LRU will kick in; that means LeastRecentlyUsed will get deleted
+        # 1 chunk =~ 2MB
+        # This config has some issues; see https://github.com/fluent/fluent-bit/issues/2688
+        storage.total_limit_size 20G
+  parsers.conf: |
+    [PARSER]
+        Name   apache
+        Format regex
+        Regex  ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
+        Time_Key time
+        Time_Format %d/%b/%Y:%H:%M:%S %z
+
+    [PARSER]
+        Name   apache2
+        Format regex
+        Regex  ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
+        Time_Key time
+        Time_Format %d/%b/%Y:%H:%M:%S %z
+
+    [PARSER]
+        Name   apache_error
+        Format regex
+        Regex  ^\[[^ ]* (?<time>[^\]]*)\] \[(?<level>[^\]]*)\](?: \[pid (?<pid>[^\]]*)\])?( \[client (?<client>[^\]]*)\])? (?<message>.*)$
+
+    [PARSER]
+        Name   nginx
+        Format regex
+        Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
+        Time_Key time
+        Time_Format %d/%b/%Y:%H:%M:%S %z
+
+    [PARSER]
+        Name   json
+        Format json
+        Time_Key time
+        Time_Format %d/%b/%Y:%H:%M:%S %z
+
+    [PARSER]
+        Name        docker
+        Format      json
+        Time_Key    time
+        Time_Format %Y-%m-%dT%H:%M:%S.%L
+        Time_Keep   On
+    [PARSER]
+        Name        nginx2
+        Format      regex
+        # https://rubular.com/r/ZSLRpLS1B4XFbC
+        Regex       ^(?<n_cip>[^ ]*) (?<n_host>[^ ]*) (?<n_uid>[^ ]*) \[(?<n_time>[^\]]*)\] "(?<n_verb>\S+)(?: +(?<n_path>[^\"]*?)(?: +\S*)?)?" (?<n_rscode>[^ ]*) (?<n_rqsize>[^ ]*) (?<n_rssize>[^ ]*) (?<n_rqtime>[^ ]+) (?<n_rstime>[^ ]+) (?<n_pipe>\.*) (?:"(?<n_referer>[^\"]*)" "(?<n_agent>[^\"]*)") "(?<n_tid>[^\"]*)" "(?<n_did>[^\"]*)" "(?<n_cid>[^\"]*)" "(?<n_aid>[^\"]*)" "(?<n_aver>[^\"]*)" "(?<n_sid>[^\"]*)"
+        Time_Key    time
+        Types       n_rstime:float n_rqtime:float n_rssize:integer n_rqsize:integer
+        Time_Format %d/%b/%Y:%H:%M:%S %z
+
+    [PARSER]
+        Name        syslog
+        Format      regex
+        Regex       ^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$
+        Time_Key    time
+        Time_Format %b %d %H:%M:%S
+    [PARSER]
+        Name    catchall
+        Format  regex
+        Regex   ^(?<message>.*)$
+
+kind: ConfigMap
+metadata:
+  name: fluent-bit-config
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+  labels:
+{{- include "fluent-bit.labels" . | nindent 4 }}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/daemonset.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/daemonset.yaml
index 2eddf468c..0a5b093d8 100644
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/daemonset.yaml
+++ b/kubernetes/helm_charts/logging/fluent-bit/templates/daemonset.yaml
@@ -1,192 +1,82 @@
-apiVersion: {{ template "daemonSet.apiVersion" . }}
+---
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: {{ template "fluent-bit.fullname" . }}
+  name: fluent-bit
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
   labels:
-    app: {{ template "fluent-bit.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    k8s-app: fluent-bit-logging
+    version: v1
+    kubernetes.io/cluster-service: "true"
+    {{- include "fluent-bit.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      app: {{ template "fluent-bit.name" . }}
-      release: {{ .Release.Name }}
-{{- if .Values.podLabels }}
-{{ toYaml .Values.podLabels | indent 6 }}
-{{- end }}
+      k8s-app: fluent-bit-logging
+      version: v1
+      kubernetes.io/cluster-service: "true"
+      {{- include "fluent-bit.labels" . | nindent 6 }}
   updateStrategy:
     type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 25%
   template:
     metadata:
       labels:
-        app: {{ template "fluent-bit.name" . }}
-        release: {{ .Release.Name }}
-{{- if .Values.podLabels }}
-{{ toYaml .Values.podLabels | indent 8 }}
-{{- end }}
+        k8s-app: fluent-bit-logging
+        version: v1
+        kubernetes.io/cluster-service: "true"
+{{- include "fluent-bit.labels" . | nindent 8 }}
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
-{{- if .Values.podAnnotations }}
-{{ toYaml .Values.podAnnotations | indent 8 }}
-{{- end }}
+        fluent-bitRolloutID: {{ randAlphaNum 5 | quote }} # Restart fluent-bit after every deployment
+        fleuntbit.io/exlude: "true"
     spec:
-{{- if .Values.podSecurityContext }}
-      securityContext:
-{{ toYaml .Values.podSecurityContext | indent 8 }}
-{{- end }}
-{{- if .Values.priorityClassName }}
-      priorityClassName: "{{ .Values.priorityClassName }}"
-{{- end }}
-{{- if .Values.image.pullSecrets }}
+{{- if .Values.imagepullsecrets }}
       imagePullSecrets:
-{{ toYaml .Values.image.pullSecrets | indent 8 }}
+      - name: {{ .Values.imagepullsecrets }}
 {{- end }}
-      hostNetwork: {{ .Values.hostNetwork }}
-      dnsPolicy: {{ .Values.dnsPolicy }}
-      serviceAccountName: {{ template "fluent-bit.serviceAccountName" . }}
       containers:
       - name: fluent-bit
-        image: "{{ .Values.image.fluent_bit.repository }}:{{ .Values.image.fluent_bit.tag }}"
-        imagePullPolicy: "{{ .Values.image.pullPolicy }}"
-        env:
-{{- if .Values.backend.es.http_passwd_secret }}
-          - name: HTTP_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.backend.es.http_passwd_secret }}
-                key: {{ .Values.backend.es.http_passwd_secret_key }}
-{{- end }}
-{{- /* Only render empty array when no HTTP_PASSWORD */ -}}
-{{- if or .Values.env (not .Values.backend.es.http_passwd_secret) }}
-{{ toYaml .Values.env | indent 10 }}
-{{- end }}
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
-{{- if or .Values.metrics.enabled .Values.extraPorts }}
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullPolicy: Always
         ports:
-{{- if .Values.metrics.enabled }}
-        - name: metrics
-          containerPort: 2020
-          protocol: TCP
-{{- end -}}
-{{- if .Values.extraPorts }}
-{{ toYaml .Values.extraPorts | indent 8 }}
-{{- end }}
-{{- end }}
-{{- if .Values.securityContext }}
-        securityContext:
-{{ toYaml .Values.securityContext | indent 10 }}
-{{- end }}
+        - containerPort: 2020
+          name: http-metrics
+        env:
+        - name: FLUENT_ELASTICSEARCH_HOST
+          value: "{{ .Values.es_host }}"
+        - name: FLUENT_ELASTICSEARCH_PORT
+          value: "{{ .Values.es_port }}"
         volumeMounts:
+        - mountPath: /mnt/log
+          name: datapath
         - name: varlog
           mountPath: /var/log
         - name: varlibdockercontainers
           mountPath: /var/lib/docker/containers
           readOnly: true
-      {{- if .Values.input.systemd.enabled }}
-        - name: etcmachineid
-          mountPath: /etc/machine-id
-          readOnly: true
-      {{- end }}
-{{- if .Values.fullConfigMap }}
-        - name: config
-          mountPath: /fluent-bit/etc
-{{- else }}
-        - name: config
-          mountPath: /fluent-bit/etc/fluent-bit.conf
-          subPath: fluent-bit.conf
-        - name: config
-          mountPath: /fluent-bit/etc/fluent-bit-service.conf
-          subPath: fluent-bit-service.conf
-        - name: config
-          mountPath: /fluent-bit/etc/fluent-bit-input.conf
-          subPath: fluent-bit-input.conf
-        - name: config
-          mountPath: /fluent-bit/etc/fluent-bit-filter.conf
-          subPath: fluent-bit-filter.conf
-        - name: config
-          mountPath: /fluent-bit/etc/fluent-bit-output.conf
-          subPath: fluent-bit-output.conf
-
-{{- if .Values.parsers.enabled }}
-        - name: config
-          mountPath: /fluent-bit/etc/parsers_custom.conf
-          subPath: parsers.conf
-{{- end }}
-{{- end }}
-{{- if and .Values.backend.type "stackdriver" .Values.backend.stackdriver.google_service_credentials }}
-        - name: gcp-stackdriver-secret
-          mountPath: /secure/google_service_credentials.json
-          subPath: google_service_credentials.json
-{{- end }}
-{{- if or .Values.backend.es.tls_ca .Values.backend.es.tls_secret }}
-        - name: es-tls-secret
-          mountPath: /secure/es-tls-ca.crt
-          subPath: {{ .Values.backend.es.tls_secret_ca_key | default "es-tls-ca.crt" | quote }}
-{{- end }}
-{{- if .Values.trackOffsets }}
-        - name: tail-db
-          mountPath: /tail-db
-{{- end }}
-{{- if .Values.extraVolumeMounts }}
-{{ toYaml .Values.extraVolumeMounts | indent 8 }}
-{{- end }}
-{{ if .Values.on_minikube }}
-        - name: mnt
-          mountPath: /mnt
-          readOnly: true
-{{ end }}
+        - name: fluent-bit-config
+          mountPath: /fluent-bit/etc/
       terminationGracePeriodSeconds: 10
-    {{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-    {{- end }}
-      {{ if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-      {{- end }}
-    {{- if .Values.tolerations }}
-      tolerations:
-{{ toYaml .Values.tolerations | indent 8 }}
-    {{- end }}
       volumes:
+      - name: datapath
+        hostPath:
+          path: /mnt/log
       - name: varlog
         hostPath:
           path: /var/log
       - name: varlibdockercontainers
         hostPath:
           path: /var/lib/docker/containers
-    {{- if .Values.input.systemd.enabled }}
-      - name: etcmachineid
-        hostPath:
-          path: /etc/machine-id
-          type: File
-    {{- end }}
-{{- if or .Values.backend.es.tls_ca .Values.backend.es.tls_secret }}
-      - name: es-tls-secret
-        secret:
-          secretName: {{ .Values.backend.es.tls_secret | default ( print ( include "fluent-bit.fullname" . ) "-es-tls-secret" ) | quote }}
-{{- end }}
-{{- if and .Values.backend.type "stackdriver" .Values.backend.stackdriver.google_service_credentials }}
-      - name: gcp-stackdriver-secret
-        secret:
-          secretName: "{{ template "fluent-bit.fullname" . }}-gcp-stackdriver-secret"
-{{- end }}
-{{- if .Values.trackOffsets }}
-      - name: tail-db
-        hostPath:
-          path: {{ .Values.taildb.directory }}
-          type: DirectoryOrCreate
-{{- end }}
-      - name: config
+      - name: fluent-bit-config
         configMap:
-          name: {{ if .Values.existingConfigMap }}{{ .Values.existingConfigMap }}{{- else }}{{ template "fluent-bit.fullname" . }}-config{{- end }}
-{{- if .Values.extraVolumes }}
-{{ toYaml .Values.extraVolumes | indent 6 }}
-{{- end }}
-{{ if .Values.on_minikube }}
-      - name: mnt
-        hostPath:
-          path: /mnt
-{{ end }}
+          name: fluent-bit-config
+      serviceAccountName: fluent-bit
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        operator: Exists
+        effect: NoSchedule
+      - operator: "Exists"
+        effect: "NoExecute"
+      - operator: "Exists"
+        effect: "NoSchedule"
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/endpoint.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/endpoint.yaml
new file mode 100644
index 000000000..3502e6a2b
--- /dev/null
+++ b/kubernetes/helm_charts/logging/fluent-bit/templates/endpoint.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.es.endpoint }}
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: log-es
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+spec:
+  type: ClusterIP
+  ports:
+  - port: {{.Values.es_port}}
+    targetPort: {{.Values.es_port}}
+---
+kind: Endpoints
+apiVersion: v1
+metadata:
+  name: log-es
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+spec:
+subsets:
+- addresses:
+{{- range $ip := .Values.es.ips }}
+  - ip: {{ $ip }}
+{{- end}}
+  ports:
+  - port: {{.Values.es_port}}
+{{- end }}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/psp.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/psp.yaml
deleted file mode 100644
index 67065b660..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/psp.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-{{- if .Values.rbac.pspEnabled }}
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  name: {{ template "fluent-bit.fullname" . }}
-spec:
-  # Prevents running in privileged mode
-  privileged: false
-  # Required to prevent escalations to root.
-  allowPrivilegeEscalation: false
-  # This is redundant with non-root + disallow privilege escalation,
-  # but we can provide it for defense in depth.
-  requiredDropCapabilities:
-    - ALL
-  volumes:
-    - 'configMap'
-    - 'secret'
-    - 'hostPath'
-  allowedHostPaths:
-    - pathPrefix: "/var/log"
-    - pathPrefix: "/var/lib/docker/containers"
-      readOnly: true
-{{- if .Values.input.systemd.enabled }}
-    - pathPrefix: "/etc/machine-id"
-      readOnly: true
-{{- end }}
-    - pathPrefix: "/fluent-bit/etc"
-{{- if .Values.trackOffsets }}
-    - pathPrefix: {{ .Values.taildb.directory }}
-{{- end }}
-{{- if .Values.on_minikube }}
-    - pathPrefix: "/mnt"
-{{- end }}
-{{- range .Values.extraVolumes }}
-  {{- if .hostPath }}
-    - pathPrefix: {{ .hostPath.path }}
-  {{- end }}
-{{- end }}
-  hostNetwork: {{ .Values.hostNetwork }}
-  hostIPC: false
-  hostPID: false
-  runAsUser:
-    rule: 'RunAsAny'
-  seLinux:
-    # This policy assumes the nodes are using AppArmor rather than SELinux.
-    rule: 'RunAsAny'
-  supplementalGroups:
-    rule: 'MustRunAs'
-    ranges:
-      # Forbid adding the root group.
-      - min: 1
-        max: 65535
-  fsGroup:
-    rule: 'MustRunAs'
-    ranges:
-      # Forbid adding the root group.
-      - min: 1
-        max: 65535
-  readOnlyRootFilesystem: false
-{{- end }}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/secret.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/secret.yaml
deleted file mode 100644
index 890747d4e..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/secret.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-{{- if not .Values.backend.es.tls_secret }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: "{{ template "fluent-bit.fullname" . }}-es-tls-secret"
-  labels:
-    app: {{ template "fluent-bit.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-type: Opaque
-data:
-  es-tls-ca.crt: {{ .Values.backend.es.tls_ca | b64enc | quote }}
-{{- end }}
-{{- if eq .Values.backend.type "stackdriver" }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: "{{ template "fluent-bit.fullname" . }}-gcp-stackdriver-secret"
-  labels:
-    app: {{ template "fluent-bit.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-type: Opaque
-data:
-  google_service_credentials.json: {{ .Values.backend.stackdriver.google_service_credentials | b64enc | quote }}
-{{- end }}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/service.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/service.yaml
index 8bbc88f11..1f05e5253 100644
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/service.yaml
+++ b/kubernetes/helm_charts/logging/fluent-bit/templates/service.yaml
@@ -1,30 +1,16 @@
-{{- if .Values.metrics.enabled }}
+---
 apiVersion: v1
 kind: Service
 metadata:
-{{- if .Values.metrics.service.annotations }}
-  annotations:
-{{ toYaml .Values.metrics.service.annotations | indent 4 }}
-{{- end }}
-  name: {{ template "fluent-bit.fullname" . }}-metrics
+  name: fluent-bit-metrics
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
   labels:
-    app: {{ template "fluent-bit.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  {{- if .Values.metrics.service }}
-  {{- range $key, $value := .Values.metrics.service.labels }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
-  {{- end }}
+{{- include "fluent-bit.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.metrics.service.type}}
-  sessionAffinity: None
-  ports:
-  - port: {{ .Values.metrics.service.port }}
-    targetPort: metrics
-    name: metrics
   selector:
-    app: {{ template "fluent-bit.name" . }}
-    release: {{ .Release.Name }}
-{{- end }}
+{{- include "fluent-bit.labels" . | nindent 4 }}
+  ports:
+    - name: http
+      port: 2020
+      targetPort: 2020
+      protocol: TCP
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/serviceMonitor.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/serviceMonitor.yaml
new file mode 100644
index 000000000..35ee90c4f
--- /dev/null
+++ b/kubernetes/helm_charts/logging/fluent-bit/templates/serviceMonitor.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.serviceMonitor.enabled }}
+{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.serviceMonitor.enabled ) }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: fluent-bit
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+  labels:
+{{- include "fluent-bit.labels" . | nindent 4 }}
+{{- toYaml .Values.serviceMonitor.labels | nindent 4 }}
+spec:
+  endpoints:
+  - honorLabels: true
+    interval: 15s
+    path: /api/v1/metrics/prometheus
+    port: http
+    scheme: http
+    scrapeTimeout: 10s
+  jobLabel: fluent-bit
+  namespaceSelector:
+    matchNames:
+    - {{ default .Values.namespace .Release.Namespace  }}
+  selector:
+    matchLabels:
+    {{- include "fluent-bit.labels" . | nindent 6 }}
+{{- end }}
+{{- end }}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/serviceaccount.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/serviceaccount.yaml
index 1a1b1a0b1..f162d2bc2 100644
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/serviceaccount.yaml
+++ b/kubernetes/helm_charts/logging/fluent-bit/templates/serviceaccount.yaml
@@ -1,15 +1,29 @@
-{{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  labels:
-    app: {{ template "fluent-bit.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "fluent-bit.serviceAccountName" . }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end -}}
+  name: fluent-bit
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: fluent-bit-read
+rules:
+- apiGroups: [""]
+  resources:
+  - namespaces
+  - pods
+  verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: fluent-bit-read
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: fluent-bit-read
+subjects:
+- kind: ServiceAccount
+  name: fluent-bit
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/servicemonitor.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/servicemonitor.yaml
deleted file mode 100644
index df0a03cf5..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  {{- if .Values.metrics.serviceMonitor.namespace }}
-  namespace: {{ .Values.metrics.serviceMonitor.namespace }}
-  {{- end }}
-  labels:
-    app: {{ template "fluent-bit.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-    {{- if .Values.metrics.serviceMonitor.additionalLabels }}
-{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }}
-    {{- end }}
-spec:
-  endpoints:
-    - port: metrics
-      path: /api/v1/metrics/prometheus
-      {{- if .Values.metrics.serviceMonitor.interval }}
-      interval: {{ .Values.metrics.serviceMonitor.interval }}
-      {{- end }}
-      {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end }}
-  namespaceSelector:
-    matchNames:
-      - {{ .Release.Namespace }}
-  selector:
-    matchLabels:
-      app: {{ include "fluent-bit.name" . }}
-      release: {{ .Release.Name }}
-{{- end }}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/tests/test-configmap.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/tests/test-configmap.yaml
deleted file mode 100644
index 49f0a0091..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/tests/test-configmap.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "fluent-bit.fullname" . }}-test
-  labels:
-    app: {{ template "fluent-bit.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    heritage: "{{ .Release.Service }}"
-    release: "{{ .Release.Name }}"
-data:
-  run.sh: |-
-    {{- if eq .Values.backend.type "forward"}}
-    {{- if eq .Values.backend.forward.tls "on"}}
-    fluent-gem install fluent-plugin-secure-forward
-    {{- end }}
-    @test "Test fluentd" {
-      fluentd -c /tests/fluentd.conf --dry-run
-    }
-    {{- else if eq .Values.backend.type "es"}}
-    @test "Test Elasticssearch Indices" {
-      url="http://{{ .Values.backend.es.host }}:{{ .Values.backend.es.port }}/_cat/indices?format=json"
-      body=$(curl $url)
-
-      result=$(echo $body | jq -cr '.[] | select(.index | contains("{{ .Values.backend.es.index }}"))')
-      [ "$result" != "" ]
-
-      result=$(echo $body | jq -cr '.[] | select((.index | contains("{{ .Values.backend.es.index }}")) and (.health != "green"))')
-      [ "$result" == "" ]
-    }
-    {{- end }}
-
-  fluentd.conf: |-
-    <source>
-      {{- if eq .Values.backend.forward.tls "off" }}
-      @type forward
-      bind 0.0.0.0
-      port {{ .Values.backend.forward.port }}
-      {{- else }}
-      @type secure_forward
-      self_hostname myserver.local
-      secure no
-      {{- end }}
-      shared_key {{ .Values.backend.forward.shared_key }}
-    </source>
-
-    <match **>
-      @type stdout
-    </match>
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/tests/test.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/tests/test.yaml
deleted file mode 100644
index c030875e5..000000000
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/tests/test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-{{- if or (eq .Values.backend.type "forward") (and (eq .Values.backend.type "es") (eq .Values.backend.es.tls "off")) }}
-apiVersion: v1
-kind: Pod
-metadata:
-  name: {{ template "fluent-bit.fullname" . }}-test
-  labels:
-    app: {{ template "fluent-bit.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    heritage: "{{ .Release.Service }}"
-    release: "{{ .Release.Name }}"
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  initContainers:
-    - name: test-framework
-      image: "{{ .Values.testFramework.image}}:{{ .Values.testFramework.tag }}"
-      command:
-      - "bash"
-      - "-c"
-      - |
-        set -ex
-        # copy bats to tools dir
-        cp -R /usr/local/libexec/ /tools/bats/
-      volumeMounts:
-      - mountPath: /tools
-        name: tools
-  containers:
-    - name: {{ .Release.Name }}-test
-      {{- if eq .Values.backend.type "forward"}}
-      image: "fluent/fluentd:v1.4-debian-1"
-      {{- else }}
-      image: "dwdraju/alpine-curl-jq"
-      {{- end }}
-      command: ["/tools/bats/bats", "-t", "/tests/run.sh"]
-      {{- if and (eq .Values.backend.forward.tls "on") (eq .Values.backend.type "forward") }}
-      securityContext:
-        # run as root to install fluent gems
-        runAsUser: 0
-      {{- end }}
-      volumeMounts:
-        - mountPath: /tests
-          name: tests
-          readOnly: true
-        - mountPath: /tools
-          name: tools
-  volumes:
-  - name: tests
-    configMap:
-      name: {{ template "fluent-bit.fullname" . }}-test
-  - name: tools
-    emptyDir: {}
-  restartPolicy: Never
-{{- end }}
diff --git a/kubernetes/helm_charts/logging/fluent-bit/values.yaml b/kubernetes/helm_charts/logging/fluent-bit/values.yaml
index 2ecf44ce3..cf2ed26c7 100644
--- a/kubernetes/helm_charts/logging/fluent-bit/values.yaml
+++ b/kubernetes/helm_charts/logging/fluent-bit/values.yaml
@@ -1,309 +1,97 @@
-# Minikube stores its logs in a separate directory.
-# Enable if you install the chart in minikube.
-on_minikube: false
+# Default values for fluent-bit.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
 
-image:
-  fluent_bit:
-    repository: fluent/fluent-bit
-    tag: 1.3.7
-  pullPolicy: Always
-
-testFramework:
-  image: "dduportal/bats"
-  tag: "0.4.0"
-
-nameOverride: ""
-fullnameOverride: ""
-
-# When enabled, exposes json and prometheus metrics on {{ .Release.Name }}-metrics service
-metrics:
-  enabled: false
-  service:
-    # labels:
-    #   key: value
-    annotations: {}
-    # In order for Prometheus to consume metrics automatically use the following annotations:
-    # prometheus.io/path: "/api/v1/metrics/prometheus"
-    # prometheus.io/port: "2020"
-    # prometheus.io/scrape: "true"
-    port: 2020
-    type: ClusterIP
-  serviceMonitor:
-    enabled: false
-    additionalLabels: {}
-    # namespace: monitoring
-    # interval: 30s
-    # scrapeTimeout: 10s
+replicaCount: 1
 
-# When enabled, fluent-bit will keep track of tailing offsets across pod restarts.
-trackOffsets: false
+image:
+  repository: fluent/fluent-bit
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: "1.6.3"
 
-## PriorityClassName
-## Ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass
-priorityClassName: ""
+es_host: log-es.logging.svc.cluster.local
+es_port: 9200
 
-backend:
-  type: forward
-  forward:
-    host: fluentd
-    port: 24284
-    tls: "off"
-    tls_verify: "on"
-    tls_debug: 1
-    shared_key:
-  es:
-    host: elasticsearch
-    port: 9200
-    # Elastic Index Name
-    index: kubernetes_cluster
-    type: flb_type
-    logstash_prefix: kubernetes_cluster
-    replace_dots: "On"
-    logstash_format: "On"
-    retry_limit: "False"
-    time_key: "@timestamp"
-    # Optional username credential for Elastic X-Pack access
-    http_user:
-    # Password for user defined in HTTP_User
-    http_passwd:
-    # Optional TLS encryption to ElasticSearch instance
-    tls: "off"
-    tls_verify: "on"
-    # TLS certificate for the Elastic (in PEM format). Use if tls=on and tls_verify=on.
-    tls_ca: ""
-    # TLS debugging levels = 1-4
-    tls_debug: 1
-  splunk:
-    host: 127.0.0.1
-    port: 8088
-    token: ""
-    send_raw: "on"
-    tls: "on"
-    tls_verify: "off"
-    tls_debug: 1
-    message_key: "kubernetes"
-  stackdriver: {}
+# If es is external, We'll use kubernetes endpoint to loadBalance b/w that
+es:
+  endpoint: false
+  ips:
+    - ip1
+    - ip2
+    - ip3
 
-  ##
-  ## Ref: http://fluentbit.io/documentation/current/output/http.html
-  ##
-  http:
-    host: 127.0.0.1
-    port: 80
-    uri: "/"
-    http_user:
-    http_passwd:
-    tls: "off"
-    tls_verify: "on"
-    tls_debug: 1
-    ## Specify the data format to be used in the HTTP request body
-    ## Can be either 'msgpack' or 'json'
-    format: msgpack
-    # json_date_format: double or iso8601
-    headers: []
 
-parsers:
-  enabled: false
-  ## List the respective parsers in key: value format per entry
-  ## Regex required fields are name and regex. JSON and Logfmt required field
-  ## is name.
-  regex: []
-  logfmt: []
-  ##  json parser config can be defined by providing an extraEntries field.
-  ##  The following entry:
-  ## json:
-  ##   - extraEntries: |
-  ##       Decode_Field_As  escaped log do_next
-  ##       Decode_Field_As  json log
-  ##
-  ##  translates into
-  ##
-  ##   Command       |  Decoder  | Field | Optional Action   |
-  ##   ==============|===========|=======|===================|
-  ##   Decode_Field_As  escaped   log  do_next
-  ##   Decode_Field_As  json log
-  ##
-  json: []
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
 
-env: []
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
 
-## Annotations to add to the DaemonSet's Pods
 podAnnotations: {}
 
-## By default there different 'files' provides in the config
-## (fluent-bit.conf, custom_parsers.conf). This defeats
-## changing a configmap (since it uses subPath). If this
-## variable is set, the user is assumed to have provided,
-## in 'existingConfigMap' the entire config (etc/*) of fluent-bit,
-## parsers and system config. In this case, no subPath is
-## used
-fullConfigMap: false
-
-## ConfigMap override where fullname is {{.Release.Name}}-{{.Values.existingConfigMap}}
-## Defining existingConfigMap will cause templates/config.yaml
-## to NOT generate a ConfigMap resource
-##
-existingConfigMap: ""
-
-
-# NOTE If you want to add extra sections, add them here, inbetween the includes,
-# wherever they need to go. Sections order matters.
-
-rawConfig: |-
-  @INCLUDE fluent-bit-service.conf
-  @INCLUDE fluent-bit-input.conf
-  @INCLUDE fluent-bit-filter.conf
-  @INCLUDE fluent-bit-output.conf
-
-
-# WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# This is to add extra entries to an existing section, NOT for adding new sections
-# Do not submit bugs against indent being wrong. Add your new sections to rawConfig
-# instead.
-#
-extraEntries:
-  input: |-
-#     # >=1 additional Key/Value entrie(s) for existing Input section
-  audit: |-
-#     # >=1 additional Key/Value entrie(s) for existing Input section
-  filter: |-
-#     # >=1 additional Key/Value entrie(s) for existing Filter section
-  output: |-
-#     # >=1 additional Key/Value entrie(s) for existing Ouput section
-# WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
+podSecurityContext: {}
+  # fsGroup: 2000
 
-## Extra ports to add to the daemonset ports section
-extraPorts: []
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
 
-## Extra volumes containing additional files required for fluent-bit to work
-## (eg. CA certificates)
-## Ref: https://kubernetes.io/docs/concepts/storage/volumes/
-##
-extraVolumes: []
+service:
+  type: ClusterIP
+  port: 80
 
-## Extra volume mounts for the fluent-bit pod.
-## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-volume-storage/
-##
-extraVolumeMounts: []
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths: []
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
 
 resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   # limits:
   #   cpu: 100m
   #   memory: 128Mi
   # requests:
-  #   cpu: 10m
-  #   memory: 8Mi
+  #   cpu: 100m
+  #   memory: 128Mi
 
-# When enabled, pods will bind to the node's network namespace.
-hostNetwork: false
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
 
-# Which DNS policy to use for the pod.
-# Consider switching to 'ClusterFirstWithHostNet' when 'hostNetwork' is enabled.
-dnsPolicy: ClusterFirst
+nodeSelector: {}
 
-## Node tolerations for fluent-bit scheduling to nodes with taints
-## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-##
 tolerations: []
-# - key: "key"
-#  operator: "Equal|Exists"
-#  value: "value"
-#  effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"
 
-## Node labels for fluent-bit pod assignment
-## Ref: https://kubernetes.io/docs/user-guide/node-selection/
-##
-nodeSelector: {}
 affinity: {}
 
-service:
-  flush: 1
-  logLevel: info
-
-input:
-  tail:
-    memBufLimit: 5MB
-    parser: docker
-    path: /var/log/containers/*.log
-    ignore_older: ""
-  systemd:
-    enabled: false
-    filters:
-      systemdUnit:
-        - docker.service
-        - kubelet.service
-        - node-problem-detector.service
-    maxEntries: 1000
-    readFromTail: true
-    stripUnderscores: false
-    tag: host.*
-
-audit:
-  enable: false
-  input:
-    memBufLimit: 35MB
-    parser: docker
-    tag: audit.*
-    path: /var/log/kube-apiserver-audit.log
-    bufferChunkSize: 2MB
-    bufferMaxSize: 10MB
-    skipLongLines: On
-    key: kubernetes-audit
-
-filter:
-  kubeURL: https://kubernetes.default.svc:443
-  kubeCAFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-  kubeTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-  kubeTag: kube
-  kubeTagPrefix: kube.var.log.containers.
-
-# If true, check to see if the log field content is a JSON string map, if so,
-# it append the map fields as part of the log structure.
-  mergeJSONLog: true
-
-# If set, all unpacked keys from mergeJSONLog (Merge_Log) will be packed under
-# the key name specified on mergeLogKey (Merge_Log_Key)
-  mergeLogKey: ""
-
-# If true, enable the use of monitoring for a pod annotation of
-# fluentbit.io/parser: parser_name. parser_name must be the name
-# of a parser contained within parsers.conf
-  enableParser: true
-
-# If true, enable the use of monitoring for a pod annotation of
-# fluentbit.io/exclude: true. If present, discard logs from that pod.
-  enableExclude: true
-
-# If true, the filter reads logs coming in Journald format.
-  useJournal: false
-
-rbac:
-  # Specifies whether RBAC resources should be created
-  create: true
-  # Specifies whether a PodSecurityPolicy should be created
-  pspEnabled: false
-
-taildb:
-  directory: /var/lib/fluent-bit
-
-serviceAccount:
-  # Specifies whether a ServiceAccount should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the ServiceAccount to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name:
-
-## Specifies security settings for a container
-## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
-securityContext: {}
-  # securityContext:
-  #   privileged: true
-
-## Specifies security settings for a pod
-## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
-podSecurityContext: {}
-  # podSecurityContext:
-  #   runAsUser: 1000
+serviceMonitor:
+  enabled: true
+  labels: # labels with which the prometheus choose the serviceMonitor
+    app: prometheus-operator
+    release: prometheus-operator
diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/fluent-bit.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/fluent-bit.json
new file mode 100644
index 000000000..6614407d9
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/fluent-bit.json
@@ -0,0 +1,1509 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "Prometheus",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "Inspired by https://grafana.com/grafana/dashboards/7752",
+  "editable": true,
+  "gnetId": 7752,
+  "graphTooltip": 1,
+  "id": 60,
+  "links": [],
+  "panels": [
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorPrefix": false,
+      "colorValue": true,
+      "colors": [
+        "#d44a3a",
+        "rgba(237, 129, 40, 0.89)",
+        "#299c46"
+      ],
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 2,
+        "x": 0,
+        "y": 0
+      },
+      "id": 6,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "Active Fluent-bit",
+      "targets": [
+        {
+          "expr": "sum(kube_pod_info{pod=~\".*fluent-bit.*\"})",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "Active Fluent-bit",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "0,1",
+      "title": "Fluent Bits",
+      "transparent": true,
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#d44a3a",
+        "rgba(237, 129, 40, 0.89)",
+        "#299c46"
+      ],
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 2,
+        "x": 2,
+        "y": 0
+      },
+      "id": 4,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(kube_node_status_condition{condition=\"Ready\",status=\"true\"})",
+          "format": "time_series",
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "0,1",
+      "title": "Ready Nodes",
+      "transparent": true,
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorPrefix": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "short",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 2,
+        "x": 4,
+        "y": 0
+      },
+      "id": 36,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(kube_node_status_condition{condition!=\"Ready\",status=\"true\"})",
+          "format": "time_series",
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "1,2",
+      "title": "Non-Ready Nodes",
+      "transparent": true,
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 3,
+        "x": 6,
+        "y": 0
+      },
+      "id": 33,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "pluginVersion": "6.5.2",
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": true,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": true,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "1 - avg(rate(node_cpu_seconds_total{mode=\"idle\"}[1m]))",
+          "instant": false,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "CPU Utilisation",
+      "transparent": true,
+      "type": "singlestat",
+      "valueFontSize": "70%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 3,
+        "x": 9,
+        "y": 0
+      },
+      "id": 37,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "pluginVersion": "6.5.2",
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": true,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": true,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "1 - sum(:node_memory_MemAvailable_bytes:sum) / sum(kube_node_status_allocatable_memory_bytes)",
+          "instant": false,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Memory Utilisation",
+      "transparent": true,
+      "type": "singlestat",
+      "valueFontSize": "70%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 3,
+        "x": 12,
+        "y": 0
+      },
+      "id": 34,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "pluginVersion": "6.5.2",
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": true,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": true,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(kube_pod_container_resource_requests_cpu_cores) / sum(kube_node_status_allocatable_cpu_cores)",
+          "instant": false,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "CPU Requests Commitment",
+      "transparent": true,
+      "type": "singlestat",
+      "valueFontSize": "70%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 3,
+        "x": 15,
+        "y": 0
+      },
+      "id": 38,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "pluginVersion": "6.5.2",
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": true,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": true,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(kube_pod_container_resource_requests_memory_bytes) / sum(kube_node_status_allocatable_memory_bytes)",
+          "instant": false,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Memory Requests Commitment",
+      "transparent": true,
+      "type": "singlestat",
+      "valueFontSize": "70%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 3,
+        "x": 18,
+        "y": 0
+      },
+      "id": 35,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "pluginVersion": "6.5.2",
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": true,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": true,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(kube_pod_container_resource_limits_cpu_cores) / sum(kube_node_status_allocatable_cpu_cores)",
+          "instant": false,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "CPU Limits Commitment",
+      "transparent": true,
+      "type": "singlestat",
+      "valueFontSize": "70%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 3,
+        "x": 21,
+        "y": 0
+      },
+      "id": 39,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "pluginVersion": "6.5.2",
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": true,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": true,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(kube_pod_container_resource_limits_memory_bytes) / sum(kube_node_status_allocatable_memory_bytes)",
+          "instant": false,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Memory Limits Commitment",
+      "transparent": true,
+      "type": "singlestat",
+      "valueFontSize": "70%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 5,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 12,
+        "x": 0,
+        "y": 2
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "hideEmpty": false,
+        "hideZero": false,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": false,
+        "sort": "current",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(fluentbit_input_bytes_total[5m])) by (instance, name)",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "{{ instance }}/{{name}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Input Bytes Processing Rate",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "Bps",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 5,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 12,
+        "x": 12,
+        "y": 2
+      },
+      "hiddenSeries": false,
+      "id": 9,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": false,
+        "sort": "current",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(fluentbit_output_proc_bytes_total[5m])) by (instance, name)",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "{{ instance }}/{{name}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Output Bytes Processing Rate",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "Bps",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 5,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 12,
+        "x": 0,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 40,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": false,
+        "sort": "current",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(fluentbit_input_records_total[5m])) by (instance, name)",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "{{ instance }}/{{name}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Input Records Processing Rate",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "rps",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 5,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 12,
+        "x": 12,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 41,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "hideEmpty": false,
+        "hideZero": false,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": false,
+        "sort": "current",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(fluentbit_output_proc_records_total[5m])) by (instance, name)",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "{{ instance }}/{{name}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Output Record Processing Rate",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "rps",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 12,
+        "x": 0,
+        "y": 14
+      },
+      "hiddenSeries": false,
+      "id": 11,
+      "legend": {
+        "alignAsTable": false,
+        "avg": true,
+        "current": true,
+        "hideEmpty": true,
+        "hideZero": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": false,
+        "sort": "current",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(fluentbit_output_retries_total[1m])) by (instance, name)",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "{{instance}} Retries to {{name}}",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(rate(fluentbit_output_retries_failed_total[1m])) by (instance, name)",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "{{instance}} Failed Retries to {{ name }}",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Output Retry/Failed Rates",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": null,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 12,
+        "x": 12,
+        "y": 14
+      },
+      "hiddenSeries": false,
+      "id": 10,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "hideEmpty": true,
+        "hideZero": true,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "sort": "current",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(fluentbit_output_errors_total[1m])) by (instance, name)",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "{{ instance }}/{{ name }}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Output Error Rate",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "errors/sec",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": "5m",
+  "schemaVersion": 25,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
+  },
+  "timezone": "",
+  "title": "Fluent Bit",
+  "uid": "fluentbit",
+  "version": 1
+}
diff --git a/kubernetes/helm_charts/monitoring/dashboards/values.yaml b/kubernetes/helm_charts/monitoring/dashboards/values.yaml
index 4a6efe46c..130365b53 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/values.yaml
+++ b/kubernetes/helm_charts/monitoring/dashboards/values.yaml
@@ -421,6 +421,9 @@ dashboards2:
        file: dashboards/api-manager-old.json
      dashboardkong4:
        file: dashboards/api-manager-req-resp-aggregated-beta.json
+   fluentbit:
+     fluent-bit:
+       file: dashboards/fluent-bit.json
    nginx:
      nginxdetailed:
        file: dashboards/nginx-detailed.json

From 0259949ddb427ba3b6130ae401a16fa7705d9d35 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 4 Nov 2020 15:58:34 +0530
Subject: [PATCH 025/184] Disabling storage retention for fluentbit (#2022)
 (#2023)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../helm_charts/logging/fluent-bit/templates/configMap.yaml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
index 010761e6e..b6fab89e3 100644
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
+++ b/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
@@ -98,7 +98,7 @@ data:
         # After this LRU will kick in; that means LeastRecentlyUsed will get deleted
         # 1 chunk =~ 2MB
         # This config has some issues; see https://github.com/fluent/fluent-bit/issues/2688
-        storage.total_limit_size 20G
+        # storage.total_limit_size 20G
   parsers.conf: |
     [PARSER]
         Name   apache

From 3e18b9fdac130c788b0579b840492a62cdc524fe Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 4 Nov 2020 16:23:08 +0530
Subject: [PATCH 026/184] enable api compression (#2024)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../core/nginx-public-ingress/values.j2       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index b10380df3..68e73dc52 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -326,6 +326,34 @@ proxyconfig: |-
       if ( $http_authorization ) {
         set $custom_header "$http_authorization";
       }
+      # Compression                                           
+      gzip on;                                                
+      gzip_comp_level    5;                                   
+      gzip_min_length    256; # 256Bytes
+      gzip_proxied       any;                                 
+      gzip_vary          on;                                  
+      # Content types for compression                         
+      gzip_types                                              
+      application/atom+xml                                    
+      application/javascript                                  
+      application/json                                        
+      application/ld+json                                     
+      application/manifest+json                               
+      application/rss+xml                                     
+      application/vnd.geo+json                                
+      application/vnd.ms-fontobject                           
+      application/x-font-ttf                                  
+      application/x-web-app-manifest+json                     
+      application/xhtml+xml                                   
+      application/xml                                         
+      font/opentype                                           
+      image/bmp                                               
+      image/svg+xml                                           
+      image/x-icon                                            
+      text/cache-manifest                                     
+      text/css                                                
+      text/plain                                              
+      #
       proxy_set_header Authorization $custom_header;
       rewrite ^/api/(.*) /$1 break;
       proxy_set_header Connection "";

From 1a6945034396e587e2ce295fdfe63f628d7a80a6 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 4 Nov 2020 16:57:36 +0530
Subject: [PATCH 027/184] Nginx enabled logging parser (#2027)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../core/nginx-public-ingress/templates/daemonset.yaml           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml b/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
index 3b647c055..865d1cc28 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
@@ -16,6 +16,7 @@ spec:
     metadata:
       annotations:
         nginxRolloutID: {{ randAlphaNum 5 | quote }} # Restart nginx after every deployment
+        fluentbit.io/parser: nginx2
       labels:
         app: nginx-public-ingress
     spec:

From 37c98e7ef5b995e9a740b73e6b6478e42d601a98 Mon Sep 17 00:00:00 2001
From: Pradyumna <pradyumnan@ilimi.in>
Date: Thu, 5 Nov 2020 11:02:29 +0530
Subject: [PATCH 028/184] Issue #SC-2041 feat: Updated private ingress for
 enc-service (#2028)

* Issue #SC-2041 feat: Updated private ingress for enc-service
---
 .../core/nginx-private-ingress/templates/configmap.yaml      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml b/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
index 66f4006da..7ac4bbf3f 100644
--- a/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
+++ b/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
@@ -122,6 +122,11 @@ data:
           rewrite ^/analytics/(.*) /$1 break;
           proxy_pass $target;
         }
+        location /enc/ {
+          set $target http://enc-service.{{ .Values.namespace }}.svc.cluster.local:8013;
+          rewrite ^/enc/(.*) /$1 break;
+          proxy_pass $target;
+        }
       }
     }
 kind: ConfigMap

From 931a9c57d19743de0dc7710c155e81280dac4d07 Mon Sep 17 00:00:00 2001
From: AMIT KUMAR <amit.kumar@tarento.com>
Date: Fri, 6 Nov 2020 12:51:46 +0530
Subject: [PATCH 029/184] Tg642 (#2031)

* Issue #TG642 feat:fix logback file

* Issue #TG642 feat:logback fix
---
 .../stack-sunbird/templates/learner-service_logback.xml      | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/learner-service_logback.xml b/ansible/roles/stack-sunbird/templates/learner-service_logback.xml
index 6fb82065f..b0509c2dc 100644
--- a/ansible/roles/stack-sunbird/templates/learner-service_logback.xml
+++ b/ansible/roles/stack-sunbird/templates/learner-service_logback.xml
@@ -100,7 +100,6 @@
 
   </appender>
 
-  <logger name="play" level="INFO" />
   <logger name="defaultLoggerAppender" level="INFO" />
   <!-- Telemetry Loggers-->
   <logger name="TelemetryEventLogger" level="INFO">
@@ -111,10 +110,6 @@
     <appender-ref ref="defaultLoggerAppender" />
   </logger>
 
-  <logger name="org.sunbird" level="INFO">
-    <appender-ref ref="defaultLoggerAppender" />
-  </logger>
-
   <root level="INFO">
     <appender-ref ref="ASYNCSTDOUT" />
   </root>

From 03e8b4ad386c5218e912826b0ae956485f611c3a Mon Sep 17 00:00:00 2001
From: Kumar Gauraw <gaurawk@ilimi.in>
Date: Fri, 6 Nov 2020 14:17:28 +0530
Subject: [PATCH 030/184] Issue #DP-1337 fix: updated import api config (#2032)

---
 ansible/inventory/env/group_vars/all.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index 44adcfaf9..b9cb15a62 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -619,8 +619,8 @@ sunbird_druid_broker_host: "http://{{groups['dp-druid-broker'][0]}}"
 # Content-service
 lp_cassandra_keyspace_prefix: "{{ env }}"
 lp_kafka_url: "{{sunbird_processing_kafka_host}}"
-content_import_required_props: '["name","code","mimeType","contentType","artifactUrl","framework"]'
-content_import_remove_props: '["downloadUrl","variants","previewUrl","streamingUrl","itemSets","level1Name","level1Concept","level2Name","level2Concept","level3Name","level3Concept","me_totalPlaySessionCount","me_totalTimeSpentInSec","me_totalSessionsCount","me_totalTimespent","me_totalInteractions","me_creationSessions","me_creationTimespent","me_averageInteractionsPerMin","me_averageSessionsPerDevice","me_totalDevices","me_averageTimespentPerSession","me_averageRating","me_totalDownloads","me_totalSideloads","me_totalRatings","me_totalComments","me_totalDialcode","me_totalDialcodeLinkedToContent","me_totalDialcodeAttached","me_hierarchyLevel","origin","originData","contentPolicyCheck"]'
+content_import_required_props: '["name","code","mimeType","primaryCategory","artifactUrl","framework"]'
+content_import_remove_props: '["downloadUrl","variants","previewUrl","streamingUrl","itemSets","level1Name","level1Concept","level2Name","level2Concept","level3Name","level3Concept","me_totalPlaySessionCount","me_totalTimeSpentInSec","me_totalSessionsCount","me_totalTimespent","me_totalInteractions","me_creationSessions","me_creationTimespent","me_averageInteractionsPerMin","me_averageSessionsPerDevice","me_totalDevices","me_averageTimespentPerSession","me_averageRating","me_totalDownloads","me_totalSideloads","me_totalRatings","me_totalComments","me_totalDialcode","me_totalDialcodeLinkedToContent","me_totalDialcodeAttached","me_hierarchyLevel","origin","originData","contentPolicyCheck","questions"]'
 
 # Print Service
 #kp_sunbird_account_name: "{{azure_account_name}}"

From 684ffa01b6fcaaecc54fdb9a5cce6513700de8a2 Mon Sep 17 00:00:00 2001
From: Harsha <harshavardhanc95@gmail.com>
Date: Fri, 6 Nov 2020 16:52:41 +0530
Subject: [PATCH 031/184] Issue #DO-2719: enabling storage account for
 discussion forum (#2034)

* adding nodebb storage variable

* adding nodebb storage variable

* adding nodebb storage variable

* removing unwanted file
---
 ansible/inventory/env/group_vars/all.yml                    | 3 +++
 ansible/roles/stack-sunbird/templates/sunbird_nodebb.env    | 6 ++++--
 .../helm_charts/core/nodebb/templates/deployment.yaml       | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index b9cb15a62..65eb1db11 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -646,3 +646,6 @@ dp_play_http_secret_key: "mysecretdpplaysecretkey"
 # LMS Service vars
 group_activity_agg_cache_ttl: 3600
 group_activity_agg_cache_enable: false
+
+# nodebb variables
+sunbird_nodebb_storage_key: "{{ core_vault_sunbird_nodebb_storage_key }}"
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env b/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
index 961c5822b..1f5f3155c 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
@@ -1,2 +1,4 @@
-sunbird_nodebb_url=https://{{ domain_name }}/discussions
-redis_nodebb_host="{{ groups['redis-nodebb'][0]}}"
+AZURE_STORAGE_ACCOUNT={{sunbird_nodebb_storage_account}}
+AZURE_STORAGE_ACCESS_KEY={{sunbird_nodebb_storage_key}}
+AZURE_STORAGE_CONTAINER={{sunbird_nodebb_container}}
+AZURE_STORAGE_HOSTNAME={{sunbird_nodebb_hostname}}
diff --git a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
index b25dd6987..10e4c3825 100644
--- a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
@@ -32,6 +32,9 @@ spec:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
         imagePullPolicy: Always
+        envFrom:
+        - configMapRef:
+            name: {{ .Chart.Name }}-config
         volumeMounts:
           - name: nodebb-config-json
             mountPath: /usr/src/app/config.json

From 8eaf37dfdbd69958381c21e11e655e3dac4dc6a6 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Mon, 9 Nov 2020 16:04:07 +0530
Subject: [PATCH 032/184] Merge release-3.3.0 to 3.4.0 (#2037)

* Issue #SB-21135 feat: Updated LMS configuration (#2003)

* Issue #SC-1929 feat: Courses logback changes

* Issue #SC-2041 feat: Updated issue certificate topic config

* Issue #SB-21135 feat: Updated LMS configuration

* Issue #SB-21135 feat: Updated LMS configuration

* Issue #SB-21135 feat: Updated LMS configuration

* Enanbling secured way to upload files using jenkins (#2004)

* Issue #SB-21123 fix: updated config for search-service (#2005)

* Issue #SB-21123 fix: updated config for search-service

* Issue #SB-21123 fix: updated variable name

* Merge 3.2.7 to 3.3.0 (#2008)

* Added the secor process alert rules. (#2012)

* added the druid alert rules (#1996)

* Issue #TG607: added the druid alert rules

* Issue #TG607: added the druid alert rules

* Issue #TG607: updated the druid alert rules

* Issue #0000: added the datasource name in message field.

* Issue #0000: removed the rollup datasource

* Issue #0000: added the secor process alert rules

* Issue #0000: added the email config

* Issue #0000: added the secor processes names

* Issue #0000: updated the alert name

* Issue #0000: removed the old secor alertrules

* Issue #TG-641: updated the alert rules

* Issue #TG-641: added the druid monitoring vars (#2016)

* Same logging for nginx-public and private ingress (#2017)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Issue #SB-0000 feat: updating DEACTIVATE_JOB_API_HOST env var (#2018)

* Issue #SB-0000 feat: updating DEACTIVATE_JOB_API_HOST env var

* Issue #SB-0000 feat: api key env var added

* Issue #SB-0000 feat: using internal route for kong endpoint.

* Adding fluent-bit chart (#2019) (#2020)

Adding type conversion for nginx logs

* Disabling storage retention for fluentbit (#2022)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Nginx enabled logging parser (#2026)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

Co-authored-by: Pradyumna <pradyumnan@ilimi.in>
Co-authored-by: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Co-authored-by: Kumar Gauraw <gaurawk@ilimi.in>
Co-authored-by: kaliraja <34502260+Kaali09@users.noreply.github.com>
Co-authored-by: Ravinder Kumar <ravinder@ilimi.in>
---
 .../templates/sunbird_report-service.env          |  3 ++-
 .../roles/sunbird-monitoring/defaults/main.yml    |  3 +++
 .../sunbird-monitoring/templates/alertrules.yaml  |  4 ++--
 .../templates/configmap.yaml                      | 15 ++++++++++++---
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_report-service.env b/ansible/roles/stack-sunbird/templates/sunbird_report-service.env
index e9fba5a25..9d609a0cc 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_report-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_report-service.env
@@ -8,4 +8,5 @@ SUNBIRD_BASE_REPORT_URL=report
 SUNBIRD_REPORTS_TABLE_NAME=report
 SUNBIRD_REPORT_SUMMARY_TABLE_NAME={{sunbird_report_summary_table_name}}
 SUNBIRD_ENV="https://{{domain_name}}"
-DEACTIVATE_JOB_API_HOST={{sunbird_analytics_api_base_url}}/report/jobs/deactivate
+DEACTIVATE_JOB_API_HOST=http://kong:8000/data/v1/report/jobs/deactivate
+DEACTIVATE_JOB_API_KEY={{sunbird_api_auth_token}}   
\ No newline at end of file
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
index 1ae68b62c..931267c55 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
@@ -205,3 +205,6 @@ prometheus_spec_overrides:
   sb_test_var: dummy_var_not_to_throw_error
 alertmanager_spec_overrides:
   sb_test_var: dummy_var_not_to_throw_error
+
+druid_raw_ingestion_lag_threshold: 200000
+druid_rollup_ingestion_lag_threshold: 200000
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
index b448efd7d..62ad4633d 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
@@ -56,8 +56,8 @@ raw_druid_datasource:
   - sl_observations_production
   - telemetry-feedback-events
 
-druid_raw_ingestion_threshold: 200000
-druid_rollup_ingestion_threshold: 200000
+druid_raw_ingestion_threshold: "{{ druid_raw_ingestion_lag_threshold | defaut(200000) }}"
+druid_rollup_ingestion_threshold: "{{ druid_rollup_ingestion_lag_threshold  | defaut(200000)}}"
 
 secor_process_names:
   - channel-telemetry-backup
diff --git a/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml b/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
index 7ac4bbf3f..8b25a0cd7 100644
--- a/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
+++ b/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
@@ -16,10 +16,19 @@ data:
       default_type  application/octet-stream;
       lua_load_resty_core off;
       lua_package_path "/etc/nginx/lua_modules/?.lua";
-      log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                        '$status $body_bytes_sent "$http_referer" '
-                        '"$http_user_agent" "$http_x_forwarded_for"';
+      log_format  main  '$remote_addr - $remote_user [$time_local] '
+                        '"$request" $status $request_length $body_bytes_sent'
+                        ' $request_time $upstream_response_time $pipe'
+                        ' "$http_referer" "$http_user_agent" "$sb_request_id"'
+                        ' "$http_x_device_id" "$http_x_channel_id" "$http_x_app_id"'
+                        ' "$http_x_app_ver" "$http_x_session_id"';
     
+      # If the client send request_id it should be preffered over the default one
+      map $http_x_request_id $sb_request_id {
+        default  $http_x_request_id;
+        ''  $request_id;
+      }
+
       access_log  /var/log/nginx/access.log  main;
       include /etc/nginx/conf.d/*.conf;
       sendfile        on;

From 1a9c3e898012a9b8d5865c22ecb1c27423e37818 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 11 Nov 2020 10:30:34 +0530
Subject: [PATCH 033/184] Monitoring changes (#2039)

* Adding nginx service annotations

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Adding auto pod discovery support for prom-operator

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Adding cassandra exporter

* making default refresh rate at 60s

By default it'll be 1s, and refresh is a resource consuming operation.
Which is not good for heavy indexing indices

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Adding file descriptors in load dashboard

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Update nginx dashboard to fetch data from Promtheus

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 ansible/cassandra-exporter.yaml               |   6 +
 ansible/esupgradelatest.yml                   |  11 +-
 ansible/roles/cassandra-exporter/README.md    |  43 +++
 .../cassandra-exporter/defaults/main.yml      |  15 ++
 .../cassandra-exporter/handlers/main.yml      |  15 ++
 .../roles/cassandra-exporter/meta/main.yml    |  60 +++++
 .../roles/cassandra-exporter/tasks/main.yml   |  97 +++++++
 .../cassandra-exporter-config.yaml.j2         | 139 ++++++++++
 .../templates/cassandra_exporter.sh.j2        |   2 +
 .../prometheus-cassandra-exporter.service.j2  |  15 ++
 .../roles/cassandra-exporter/tests/inventory  |   2 +
 .../roles/cassandra-exporter/tests/test.yml   |   6 +
 .../roles/cassandra-exporter/vars/main.yml    |   1 +
 .../templates/additional-scrape-configs.yaml  |  32 +++
 .../templates/daemonset.yaml                  |   4 +
 .../core/nginx-public-ingress/values.j2       |   1 +
 .../dashboards/dashboards/cassandra.json      |  19 +-
 .../dashboards/dashboards/load-metrics.json   | 246 +++++++++++++++++-
 .../dashboards/dashboards/nginx.json          |  35 ++-
 .../provision/cassandra/Jenkinsfile.exporter  |  51 ++++
 20 files changed, 763 insertions(+), 37 deletions(-)
 create mode 100644 ansible/cassandra-exporter.yaml
 create mode 100644 ansible/roles/cassandra-exporter/README.md
 create mode 100644 ansible/roles/cassandra-exporter/defaults/main.yml
 create mode 100644 ansible/roles/cassandra-exporter/handlers/main.yml
 create mode 100644 ansible/roles/cassandra-exporter/meta/main.yml
 create mode 100644 ansible/roles/cassandra-exporter/tasks/main.yml
 create mode 100644 ansible/roles/cassandra-exporter/templates/cassandra-exporter-config.yaml.j2
 create mode 100644 ansible/roles/cassandra-exporter/templates/cassandra_exporter.sh.j2
 create mode 100644 ansible/roles/cassandra-exporter/templates/etc/systemd/system/prometheus-cassandra-exporter.service.j2
 create mode 100644 ansible/roles/cassandra-exporter/tests/inventory
 create mode 100644 ansible/roles/cassandra-exporter/tests/test.yml
 create mode 100644 ansible/roles/cassandra-exporter/vars/main.yml
 create mode 100644 pipelines/provision/cassandra/Jenkinsfile.exporter

diff --git a/ansible/cassandra-exporter.yaml b/ansible/cassandra-exporter.yaml
new file mode 100644
index 000000000..a5802cab7
--- /dev/null
+++ b/ansible/cassandra-exporter.yaml
@@ -0,0 +1,6 @@
+- hosts: cassandra
+  become: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  roles:
+    - cassandra-exporter
diff --git a/ansible/esupgradelatest.yml b/ansible/esupgradelatest.yml
index a0f7a9536..d14ea66e0 100644
--- a/ansible/esupgradelatest.yml
+++ b/ansible/esupgradelatest.yml
@@ -22,6 +22,14 @@
         es_etc_cluster_name: "{{ node_name }}"
       }
   post_tasks:
+    # This will make some performance tuning
+    # Ref: https://aws.amazon.com/premiumsupport/knowledge-center/elasticsearch-indexing-performance/
+    #
+    # Number of replicas: 0  # this is make sure that there is no backup and hence, no disk write. Good for logging indices
+    # refresh_interval: 60s  # Refresh interval is the setting which make sure the latest indexed data will be available for search.
+    #                        # But refresh is a heavy resource intensive operation, which can be run once in a minute than once in a second
+    #                        # https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
+    #
     - name: Changing log es index replica to zero
       uri:
         url: "http://{{groups['log-es'][0]}}:9200/_template/logstash"
@@ -32,7 +40,8 @@
             ],
             "settings": {
               "number_of_shards": 5,
-              "number_of_replicas": 0
+              "number_of_replicas": 0,
+              "refresh_interval" : "60s"
             }
            }
         body_format: json
diff --git a/ansible/roles/cassandra-exporter/README.md b/ansible/roles/cassandra-exporter/README.md
new file mode 100644
index 000000000..e388a8f39
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/README.md
@@ -0,0 +1,43 @@
+Role Name
+=========
+
+Role to install `cassandra exporter java binary` as a `systemd` service
+
+Role Variables
+--------------
+
+| Name           | Default Value | Description                        |
+| -------------- | ------------- | -----------------------------------|
+| `cassandra_exporter_version` | 2.2.0 | Cassandra exporter package version |
+| `cassandra_listen_address` | 0.0.0.0 | Cassandra exporter listening address |
+| `cassandra_listen_port` | 8080 | Cassandra exporter listening port |
+| `cassandra_exporter_binary_url` | https://github.com/criteo/cassandra_exporter/releases/download/{{cassandra_exporter_version}}/cassandra_exporter-{{cassandra_exporter_version}}-all.jar | Cassandra exporter jar download location |
+| `cassandra_exporter_config_url` | https://raw.githubusercontent.com/criteo/cassandra_exporter/master/config.yml | Cassandra exporter config download location |
+| `cassandra_exporter_config` |  | Cassandra exporter config file in local disk, if defined ,`cassandra_exporter_config_url` is ignored |
+| `cassandra_exporter_user` | cassandra-exp | UNIX user to run the binary |
+| `cassandra_exporter_group` | cassandra-exp | UNIX group to run the binary |
+| `cassandra_exporter_root_dir` | /opt/cassandra_exporter | Base location where cassandra exporter stuff is downloaded |
+| `cassandra_exporter_dist_dir` | /opt/cassandra_exporter/dist | Location for binary and systemd service script |
+| `cassandra_exporter_config_dir` | /opt/cassandra_exporter/config | Location for config |
+
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      become: true
+      become_method: sudo
+      roles:
+        - role: ansible-cassandra-exporter
+
+Usage
+-----
+
+You may install the role locally using `ansible-galaxy install -r requirements.yml -p roles/` where `requirements.yml` reads something like
+
+```
+- src: git+https://github.com/criteo/cassandra_exporter/ansible/roles
+  version: TBD
+```
diff --git a/ansible/roles/cassandra-exporter/defaults/main.yml b/ansible/roles/cassandra-exporter/defaults/main.yml
new file mode 100644
index 000000000..8a9309e8a
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/defaults/main.yml
@@ -0,0 +1,15 @@
+---
+
+cassandra_exporter_version: 2.3.5
+
+cassandra_exporter_listen_address: "0.0.0.0"
+cassandra_exporter_listen_port: "8080"
+cassandra_exporter_binary_url: 'https://github.com/criteo/cassandra_exporter/releases/download/{{cassandra_exporter_version}}/cassandra_exporter-{{cassandra_exporter_version}}.jar'
+cassandra_exporter_config_url: 'https://raw.githubusercontent.com/criteo/cassandra_exporter/{{cassandra_exporter_version}}/config.yml'
+
+cassandra_exporter_user: cassandra-exp
+cassandra_exporter_group: cassandra-exp
+
+cassandra_exporter_root_dir: /opt/cassandra_exporter
+cassandra_exporter_dist_dir: "{{ cassandra_exporter_root_dir }}/dist"
+cassandra_exporter_config_dir: "{{ cassandra_exporter_root_dir }}/config"
diff --git a/ansible/roles/cassandra-exporter/handlers/main.yml b/ansible/roles/cassandra-exporter/handlers/main.yml
new file mode 100644
index 000000000..6973d9f19
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/handlers/main.yml
@@ -0,0 +1,15 @@
+---
+
+- name: reenable cassandra exporter service
+  systemd:
+    daemon_reload: yes
+    enabled: yes
+    name: prometheus-cassandra-exporter
+
+- name: reinit cassandra exporter
+  command: initctl reload-configuration
+
+- name: restart cassandra exporter
+  service:
+    name: prometheus-cassandra-exporter
+    state: restarted
diff --git a/ansible/roles/cassandra-exporter/meta/main.yml b/ansible/roles/cassandra-exporter/meta/main.yml
new file mode 100644
index 000000000..326a6298c
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/meta/main.yml
@@ -0,0 +1,60 @@
+galaxy_info:
+  author: Pankaj M. Tolani
+  description: DevOps Engineer
+  company: Autonomous Thingz Pty Ltd
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license (GPLv2, CC-BY, etc)
+
+  min_ansible_version: 2.4
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If Travis integration is configured, only notifications for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  #github_branch:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: Cassandra, JMX, Exporter, Systemd, Service
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
diff --git a/ansible/roles/cassandra-exporter/tasks/main.yml b/ansible/roles/cassandra-exporter/tasks/main.yml
new file mode 100644
index 000000000..b342701b4
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/tasks/main.yml
@@ -0,0 +1,97 @@
+---
+
+- name: 'create cassandra exporter group'
+  group:
+    name: '{{ cassandra_exporter_group }}'
+    system: yes
+    state: present
+
+- name: 'create cassandra exporter user'
+  user:
+    name: '{{ cassandra_exporter_user }}'
+    system: yes
+    shell: '/sbin/nologin'
+    group: '{{ cassandra_exporter_group }}'
+    createhome: no
+
+- name: 'create cassandra exporter directories'
+  file:
+    path: '{{ item }}'
+    state: directory
+    owner: '{{ cassandra_exporter_user }}'
+    group: '{{ cassandra_exporter_group }}'
+    mode: 0755
+  with_items:
+    - '{{ cassandra_exporter_root_dir }}'
+    - '{{ cassandra_exporter_dist_dir }}'
+    - '{{ cassandra_exporter_config_dir }}'
+
+- name: 'download cassandra exporter binary'
+  get_url:
+    url: '{{ cassandra_exporter_binary_url }}'
+    dest: '{{ cassandra_exporter_dist_dir }}/cassandra.jar'
+
+- name: 'Copy cassandra exporter config'
+  template:
+    src: cassandra-exporter-config.yaml.j2
+    dest: '{{ cassandra_exporter_config_dir }}/config.yml'
+  notify:
+    - restart cassandra exporter
+
+- name: 'set cassandra listen address'
+  lineinfile:
+    regexp: "^listenAddress"
+    dest:  "{{ cassandra_exporter_config_dir }}/config.yml"
+    line: "listenAddress: {{ cassandra_exporter_listen_address }}"
+  notify:
+    - restart cassandra exporter
+
+- name: 'set cassandra listen port'
+  lineinfile:
+    regexp: "^listenPort"
+    dest:  "{{ cassandra_exporter_config_dir }}/config.yml"
+    line: "listenPort: {{ cassandra_exporter_listen_port }}"
+  notify:
+    - restart cassandra exporter
+
+- name: 'generate the shell script'
+  template:
+    src: cassandra_exporter.sh.j2
+    dest: '{{ cassandra_exporter_dist_dir }}/cassandra_exporter.sh'
+    owner: root
+    group: root
+    mode: 0755
+  register: prometheus_cassandra_exporter_updated
+  notify:
+    - restart cassandra exporter
+
+- name: 'update group and owner for files'
+  file:
+    path: '{{ item }}'
+    state: file
+    owner: '{{ cassandra_exporter_user }}'
+    group: '{{ cassandra_exporter_group }}'
+  with_items:
+    - '{{ cassandra_exporter_dist_dir }}/cassandra.jar'
+    - '{{ cassandra_exporter_config_dir }}/config.yml'
+  when: prometheus_cassandra_exporter_updated is changed
+
+- name: 'create systemd service unit'
+  template:
+    src: etc/systemd/system/prometheus-cassandra-exporter.service.j2
+    dest: /etc/systemd/system/prometheus-cassandra-exporter.service
+    owner: root
+    group: root
+    mode: 0644
+  when: service_mgr | default(ansible_service_mgr) == 'systemd'
+  notify:
+    - reenable cassandra exporter service
+    - restart cassandra exporter
+
+- meta: flush_handlers
+
+- name: 'ensure prometheus cassandra exporter service is enabled and started'
+  service:
+    name: prometheus-cassandra-exporter
+    state: started
+    enabled: yes
diff --git a/ansible/roles/cassandra-exporter/templates/cassandra-exporter-config.yaml.j2 b/ansible/roles/cassandra-exporter/templates/cassandra-exporter-config.yaml.j2
new file mode 100644
index 000000000..f5d6b595f
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/templates/cassandra-exporter-config.yaml.j2
@@ -0,0 +1,139 @@
+host: localhost:7199
+ssl: False
+user:
+password:
+listenAddress: 0.0.0.0
+listenPort: 8080
+# Regular expression to match environment variable names that will be added
+# as labels to all data points. The name of the label will be either
+# $1 from the regex below, or the entire environment variable name if no match groups are defined
+#
+# Example:
+# additionalLabelsFromEnvvars: "^ADDL\_(.*)$"
+additionalLabelsFromEnvvars:
+blacklist:
+  # To profile the duration of jmx call you can start the program with the following options
+  # > java -Dorg.slf4j.simpleLogger.defaultLogLevel=trace -jar cassandra_exporter.jar config.yml --oneshot
+  #
+  # To get intuition of what is done by cassandra when something is called you can look in cassandra
+  # https://github.com/apache/cassandra/tree/trunk/src/java/org/apache/cassandra/metrics
+  # Please avoid to scrape frequently those calls that are iterating over all sstables
+
+  # Unaccessible metrics (not enough privilege)
+  - java:lang:memorypool:.*usagethreshold.*
+
+  # Leaf attributes not interesting for us but that are presents in many path
+  - .*:999thpercentile
+  - .*:95thpercentile
+  - .*:fifteenminuterate
+  - .*:fiveminuterate
+  - .*:durationunit
+  - .*:rateunit
+  - .*:stddev
+  - .*:meanrate
+  - .*:mean
+  - .*:min
+
+  # Path present in many metrics but uninterresting
+  - .*:viewlockacquiretime:.*
+  - .*:viewreadtime:.*
+  - .*:cas[a-z]+latency:.*
+  - .*:colupdatetimedeltahistogram:.*
+
+  # Mostly for RPC, do not scrap them
+  # - org:apache:cassandra:db:.*
+  - org:apache:cassandra:db:batchlogmanager:.*
+  - org:apache:cassandra:db:caches:.*
+  - org:apache:cassandra:db:dynamicendpointsnitch:.*
+  - org:apache:cassandra:db:indexcolumnfamilies:.*
+  - org:apache:cassandra:db:indexsummaries:.*
+  - org:apache:cassandra:db:indextables:.*
+  - org:apache:cassandra:db:nativeaccess:.*
+  - org:apache:cassandra:db:storageproxy:.*
+
+  # columnfamily is an alias for Table metrics
+  # https://github.com/apache/cassandra/blob/8b3a60b9a7dbefeecc06bace617279612ec7092d/src/java/org/apache/cassandra/metrics/TableMetrics.java#L162
+  - org:apache:cassandra:metrics:columnfamily:.*
+
+  # Should we export metrics for system keyspaces/tables ?
+  - org:apache:cassandra:metrics:[^:]+:system[^:]*:.*
+
+  # Some another uninterresting metrics
+  - org:apache:cassandra:metrics:indextable:.*
+  - org:apache:cassandra:metrics:indexcolumnfamily:.*
+
+  - .*:waitingonfreememtablespace:.*
+  - .*:estimatedpartitionsizehistogram:.*
+  - .*:estimatedcolumncounthistogram:.*
+
+  # Don't scrap us
+  - com:criteo:nosql:cassandra:exporter:.*
+
+maxScrapFrequencyInSec:
+  15:
+    - java:lang:garbagecollector:.*
+    - java:lang:memory:.*
+    - java:lang:threading:.*
+    - org:apache:cassandra:db:compactionmanager:compactions
+    - org:apache:cassandra:db:compactionmanager:corecompactorthreads
+    - org:apache:cassandra:db:compactionmanager:corevalidationthreads
+    - org:apache:cassandra:db:compactionmanager:maximumcompactorthreads
+    - org:apache:cassandra:db:storageservice:livenodes
+    - org:apache:cassandra:db:storageservice:unreachablenodes
+    - org:apache:cassandra:metrics:cache:keycache:hits:count
+    - org:apache:cassandra:metrics:cache:keycache:requests:count
+    - org:apache:cassandra:metrics:client:connectednativeclients:value
+    - org:apache:cassandra:metrics:clientrequest:.*:latency:count
+    - org:apache:cassandra:metrics:clientrequest:read:latency:oneminuterate
+    - org:apache:cassandra:metrics:clientrequest:read:timeouts:count
+    - org:apache:cassandra:metrics:clientrequest:read:totallatency:count
+    - org:apache:cassandra:metrics:clientrequest:read:unavailables:count
+    - org:apache:cassandra:metrics:clientrequest:write:latency:oneminuterate
+    - org:apache:cassandra:metrics:clientrequest:write:timeouts:count
+    - org:apache:cassandra:metrics:clientrequest:write:totallatency:count
+    - org:apache:cassandra:metrics:clientrequest:write:unavailables:count
+    - org:apache:cassandra:metrics:compaction:bytescompacted:count
+    - org:apache:cassandra:metrics:compaction:pendingtasks:value
+    - org:apache:cassandra:metrics:compaction:totalcompactionscompleted:count
+    - org:apache:cassandra:metrics:storage:.*
+    - org:apache:cassandra:metrics:table:[^:]+:[^:]+:percentrepaired:value
+    - org:apache:cassandra:metrics:table:percentrepaired:value
+    - org:apache:cassandra:metrics:threadpools:.*:activetasks:value
+    - org:apache:cassandra:metrics:threadpools:.*:pendingtasks:value
+    - org:apache:cassandra:metrics:threadpools:.*:totalblockedtasks:count
+    - org:apache:cassandra:metrics:table:.*:.*:readlatency:.*
+    - org:apache:cassandra:metrics:table:.*:.*:writelatency:.*
+    - org:apache:cassandra:metrics:table:.*:.*:rangelatency:.*
+    - org:apache:cassandra:metrics:table:.*:.*:sstablesperreadhistogram:.*
+    - org:apache:cassandra:metrics:table:.*:.*:livesstablecount:value
+    - org:apache:cassandra:metrics:table:.*:.*:pendingcompactions:value
+    - org:apache:cassandra:metrics:table:.*:.*:pendingflushes:count
+    - org:apache:cassandra:metrics:table:.*:.*:compactionbyteswritten:count
+    - org:apache:cassandra:metrics:streaming:totalincomingbytes:count
+    - org:apache:cassandra:metrics:streaming:totaloutgoingbytes:count
+    - org:apache:cassandra:metrics:table:.*:.*:tombstonescannedhistogram:.*
+    - org:apache:cassandra:metrics:commitlog:completedtasks:value
+    - org:apache:cassandra:metrics:table:.*:.*:memtableswitchcount:.*"
+
+  60:
+    - org:apache:cassandra:metrics:droppedmessage:.*:oneminuterate
+    - org:apache:cassandra:metrics:connection:totaltimeouts:oneminuterate
+    - org:apache:cassandra:metrics:table:.*:.*:readlatency:oneminuterate
+    - org:apache:cassandra:metrics:table:.*:.*:keycachehitrate:value
+    - org:apache:cassandra:metrics:cache:chunkcache:oneminutehitrate:value
+    - org:apache:cassandra:metrics:connection:totaltimeouts:oneminuterate
+    - org:apache:cassandra:metrics:table:.*:.*:writelatency:oneminuterate
+    - org:apache:cassandra:metrics:commitlog:waitingoncommit:oneminuterate
+  120:
+    - org:apache:cassandra:metrics:table:.*:.*:rowcachehit:count
+    - org:apache:cassandra:metrics:table:.*:.*:rowcachemiss:count
+    - org:apache:cassandra:metrics:threadpools:.*:completedtasks:value
+    - org:apache:cassandra:metrics:table:.*:.*:allmemtablesheapsize:value
+    - org:apache:cassandra:metrics:table:.*:.*:allmemtableslivedatasize:value
+    - org:apache:cassandra:metrics:table:$keyspace:.*:waitingonfreememtablespace:max
+
+  # Refresh those metrics only every hour as it is costly for cassandra to retrieve them
+  3600:
+    - .*:snapshotssize:.*
+    - .*:estimated.*
+    - .*:totaldiskspaceused:.*
diff --git a/ansible/roles/cassandra-exporter/templates/cassandra_exporter.sh.j2 b/ansible/roles/cassandra-exporter/templates/cassandra_exporter.sh.j2
new file mode 100644
index 000000000..f57a253e7
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/templates/cassandra_exporter.sh.j2
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -jar {{ cassandra_exporter_dist_dir }}/cassandra.jar {{ cassandra_exporter_config_dir }}/config.yml
diff --git a/ansible/roles/cassandra-exporter/templates/etc/systemd/system/prometheus-cassandra-exporter.service.j2 b/ansible/roles/cassandra-exporter/templates/etc/systemd/system/prometheus-cassandra-exporter.service.j2
new file mode 100644
index 000000000..f0aac29b6
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/templates/etc/systemd/system/prometheus-cassandra-exporter.service.j2
@@ -0,0 +1,15 @@
+[Unit]
+Description=Prometheus Cassandra Exporter
+After=network.target
+
+[Service]
+Type=simple
+User={{ cassandra_exporter_user }}
+Group={{ cassandra_exporter_group }}
+ExecStart={{ cassandra_exporter_dist_dir }}/cassandra_exporter.sh
+
+SyslogIdentifier=prometheus_cassandra_exporter
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ansible/roles/cassandra-exporter/tests/inventory b/ansible/roles/cassandra-exporter/tests/inventory
new file mode 100644
index 000000000..878877b07
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/ansible/roles/cassandra-exporter/tests/test.yml b/ansible/roles/cassandra-exporter/tests/test.yml
new file mode 100644
index 000000000..4c29ffaef
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/tests/test.yml
@@ -0,0 +1,6 @@
+---
+- hosts: localhost
+  become: true
+  become_method: sudo
+  roles:
+    - ansible-cassandra-exporter
diff --git a/ansible/roles/cassandra-exporter/vars/main.yml b/ansible/roles/cassandra-exporter/vars/main.yml
new file mode 100644
index 000000000..ed97d539c
--- /dev/null
+++ b/ansible/roles/cassandra-exporter/vars/main.yml
@@ -0,0 +1 @@
+---
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml
index b5dd70343..0af9d7c5f 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml
@@ -8,6 +8,38 @@
 fullnameOverride: "sunbird-monitoring"
 
 scrapeconfig:
+  # This scrape config will enable us to annotate any pod and that pod will get automonitored
+  #
+  # annotations:
+  #   prometheus.io/scrape: "true"
+  #   prometheus.io/port: "2020"
+  #   prometheus.io/path: /api/v1/metrics/prometheus
+  #
+  - job_name: 'kubernetes-pods'
+    kubernetes_sd_configs:
+    - role: pod
+    relabel_configs:
+    - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
+      action: keep
+      regex: true
+    - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
+      action: replace
+      target_label: __metrics_path__
+      regex: (.+)
+    - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
+      action: replace
+      regex: ([^:]+)(?::\d+)?;(\d+)
+      replacement: $1:$2
+      target_label: __address__
+    - action: labelmap
+      regex: __meta_kubernetes_pod_label_(.+)
+    - source_labels: [__meta_kubernetes_namespace]
+      action: replace
+      target_label: kubernetes_namespace
+    - source_labels: [__meta_kubernetes_pod_name]
+      action: replace
+      target_label: kubernetes_pod_name
+
   - job_name: 'Druid'
     metrics_path: /metrics/druid
     static_configs:
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml b/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
index 865d1cc28..96968c090 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
@@ -84,6 +84,10 @@ kind: Service
 metadata:
   name: nginx-public-ingress
   namespace: {{ .Values.namespace }}
+{{- if service.annotations }}
+  annotations:
+{{ toyaml .Values.service.annotations | indent 4 }}
+{{- end }}
 spec:
   externalTrafficPolicy: Local
   selector:
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 68e73dc52..f2d7a931c 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -3,6 +3,7 @@
 namespace: {{ namespace }}
 merge_domain_status: {{ merge_domain_status | lower }}
 service:
+  annotations: {{nginx_public_ingress_service_annotations | d('{}')  | to_json}}
   type: {{ nginx_public_ingress_type | default('LoadBalancer') }}
   {% if nginx_public_ingress_ip is defined %}
   nginx_public_ingress_ip: {{ nginx_public_ingress_ip }}
diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/cassandra.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/cassandra.json
index c9b3c7910..599906dd0 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/dashboards/cassandra.json
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/cassandra.json
@@ -15,8 +15,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 1,
-  "id": 58,
-  "iteration": 1592292254793,
+  "iteration": 1602231388710,
   "links": [],
   "panels": [
     {
@@ -3732,7 +3731,7 @@
     }
   ],
   "refresh": false,
-  "schemaVersion": 22,
+  "schemaVersion": 25,
   "style": "dark",
   "tags": [
     "cassandra"
@@ -3742,7 +3741,7 @@
       {
         "allValue": null,
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "datacenter1",
           "value": "datacenter1"
         },
@@ -3750,7 +3749,6 @@
         "definition": "",
         "hide": 0,
         "includeAll": false,
-        "index": -1,
         "label": null,
         "multi": false,
         "name": "datacenter",
@@ -3769,7 +3767,7 @@
       {
         "allValue": null,
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "Test Cluster",
           "value": "Test Cluster"
         },
@@ -3777,7 +3775,6 @@
         "definition": "",
         "hide": 0,
         "includeAll": false,
-        "index": -1,
         "label": null,
         "multi": false,
         "name": "cluster",
@@ -3804,7 +3801,6 @@
         "definition": "",
         "hide": 0,
         "includeAll": false,
-        "index": -1,
         "label": null,
         "multi": false,
         "name": "keyspace",
@@ -3823,6 +3819,7 @@
       {
         "allValue": ".*",
         "current": {
+          "selected": true,
           "text": "All",
           "value": [
             "$__all"
@@ -3832,7 +3829,6 @@
         "definition": "",
         "hide": 0,
         "includeAll": true,
-        "index": -1,
         "label": null,
         "multi": true,
         "name": "table",
@@ -3920,8 +3916,5 @@
   "timezone": "",
   "title": "Cassandra",
   "uid": "cassandra",
-  "variables": {
-    "list": []
-  },
-  "version": 1
+  "version": 6
 }
diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/load-metrics.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/load-metrics.json
index 4a5e22f1a..81fd7ac63 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/dashboards/load-metrics.json
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/load-metrics.json
@@ -15,8 +15,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 60,
-  "iteration": 1589183133348,
+  "iteration": 1604302178229,
   "links": [],
   "panels": [
     {
@@ -26,6 +25,12 @@
       "dashes": false,
       "datasource": "Prometheus",
       "decimals": 2,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -67,6 +72,7 @@
         {
           "expr": "sum by (instance) (avg without (cpu) (rate(node_cpu_seconds_total{ mode!=\"idle\"}[5m]))) * on (instance) group_left(nodename) node_uname_info{job=~\".*node-exporter\", nodename=~\"$nodename\"}",
           "format": "time_series",
+          "interval": "",
           "intervalFactor": 1,
           "legendFormat": "{{nodename}}",
           "refId": "A"
@@ -92,6 +98,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:335",
           "format": "percentunit",
           "label": null,
           "logBase": 1,
@@ -100,6 +107,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:336",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -120,6 +128,12 @@
       "dashes": false,
       "datasource": "Prometheus",
       "decimals": 2,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -216,6 +230,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -312,6 +332,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -405,6 +431,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -498,6 +530,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -584,10 +622,206 @@
         "align": false,
         "alignLevel": null
       }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 45
+      },
+      "hiddenSeries": false,
+      "id": 9,
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum by (instance) (node_filefd_allocated) * on (instance) group_left(nodename) node_uname_info{job=~\".*node-exporter\", nodename=~\"$nodename\"}",
+          "interval": "",
+          "legendFormat": "{{nodename}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Current File Descriptors",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:261",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:262",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 45
+      },
+      "hiddenSeries": false,
+      "id": 10,
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum by (instance) (node_filefd_maximum) * on (instance) group_left(nodename) node_uname_info{job=~\".*node-exporter\", nodename=~\"$nodename\"}",
+          "interval": "",
+          "legendFormat": "{{nodename}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Maximum Allowed File Descriptors",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:261",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:262",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     }
   ],
   "refresh": false,
-  "schemaVersion": 22,
+  "schemaVersion": 25,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -595,6 +829,8 @@
       {
         "allValue": null,
         "current": {
+          "selected": true,
+          "tags": [],
           "text": "All",
           "value": [
             "$__all"
@@ -622,7 +858,7 @@
     ]
   },
   "time": {
-    "from": "now-30m",
+    "from": "now-1h",
     "to": "now"
   },
   "timepicker": {
@@ -653,5 +889,5 @@
   "timezone": "",
   "title": "Load metrics",
   "uid": "B-a5y6eZz",
-  "version": 11
+  "version": 2
 }
diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/nginx.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/nginx.json
index 9eb4b39ed..67d7eee19 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/dashboards/nginx.json
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/nginx.json
@@ -16,9 +16,9 @@
   },
   "editable": true,
   "gnetId": null,
-  "graphTooltip": 0,
-  "id": 36,
-  "iteration": 1595424666886,
+  "graphTooltip": 1,
+  "id": 81,
+  "iteration": 1605070117137,
   "links": [],
   "panels": [
     {
@@ -26,7 +26,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "prom-fed",
+      "datasource": "Prometheus",
       "decimals": null,
       "fieldConfig": {
         "defaults": {
@@ -74,7 +74,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(rate(nginx_http_requests_total{cluster=~\"$cluster\"}[5m]))",
+          "expr": "sum(rate(nginx_http_requests_total[5m]))",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -84,21 +84,21 @@
           "step": 2
         },
         {
-          "expr": "sum(rate(nginx_http_requests_total{cluster=~\"$cluster\", cache_status!~\"MISS|NONE\"}[5m]))",
+          "expr": "sum(rate(nginx_http_requests_total{cache_status!~\"MISS|NONE\"}[5m]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Cached Response",
           "refId": "B"
         },
         {
-          "expr": "sum(rate(nginx_http_requests_total{cluster=~\"$cluster\"}[5m])) - sum(rate(nginx_http_requests_total{cluster=~\"$cluster\", cache_status!~\"MISS|NONE\"}[5m]))",
+          "expr": "sum(rate(nginx_http_requests_total[5m])) - sum(rate(nginx_http_requests_total{cache_status!~\"MISS|NONE\"}[5m]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Not Cached Response",
           "refId": "C"
         },
         {
-          "expr": "sum(rate(nginx_http_requests_total{cluster=~\"$cluster\", status=\"345\"}[5m]))",
+          "expr": "sum(rate(nginx_http_requests_total{ status=\"444\"}[5m]))",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -156,7 +156,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "prom-fed",
+      "datasource": "Prometheus",
       "fieldConfig": {
         "defaults": {
           "custom": {}
@@ -203,7 +203,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "(sum(increase(nginx_http_requests_total{cluster=~\"$cluster\", status!~\"4..|5..\"}[5m])) / sum(increase(nginx_http_requests_total{cluster=~\"$cluster\"}[5m]))) * 100",
+          "expr": "(sum(increase(nginx_http_requests_total{ status!~\"4..|5..\"}[5m])) / sum(increase(nginx_http_requests_total[5m]))) * 100",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -212,7 +212,7 @@
           "step": 4
         },
         {
-          "expr": "(sum(increase(nginx_http_requests_total{cluster=~\"$cluster\", status!~\"4..|5..\"}[5m])) by (status) / ignoring(status,cache_status) group_left sum(increase(nginx_http_requests_total{cluster=~\"$cluster\"}[5m]))) * 100",
+          "expr": "(sum(increase(nginx_http_requests_total{ status!~\"4..|5..\"}[5m])) by (status) / ignoring(status,cache_status) group_left sum(increase(nginx_http_requests_total[5m]))) * 100",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -271,7 +271,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "prom-fed",
+      "datasource": "Prometheus",
       "fieldConfig": {
         "defaults": {
           "custom": {}
@@ -318,7 +318,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "(sum(increase(nginx_http_requests_total{cluster=~\"$cluster\", status!~\"2..|3..\"}[5m]))/  sum(increase(nginx_http_requests_total{cluster=~\"$cluster\"}[5m]))) * 100",
+          "expr": "(sum(increase(nginx_http_requests_total{ status!~\"2..|3..\"}[5m]))/  sum(increase(nginx_http_requests_total[5m]))) * 100",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -327,7 +327,7 @@
           "step": 4
         },
         {
-          "expr": "(sum(increase(nginx_http_requests_total{cluster=~\"$cluster\", status!~\"2..|3..\"}[5m])) by (status) / ignoring(status,cache_status) group_left sum(increase(nginx_http_requests_total{cluster=~\"$cluster\"}[5m]))) * 100",
+          "expr": "(sum(increase(nginx_http_requests_total{ status!~\"2..|3..\"}[5m])) by (status) / ignoring(status,cache_status) group_left sum(increase(nginx_http_requests_total[5m]))) * 100",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -379,7 +379,7 @@
       }
     }
   ],
-  "refresh": "1m",
+  "refresh": "5m",
   "schemaVersion": 25,
   "style": "dark",
   "tags": [],
@@ -393,14 +393,14 @@
           "value": "$__all"
         },
         "datasource": "prom-fed",
-        "definition": "label_values(nginx_http_requests_total, cluster)",
+        "definition": "label_values(nginx_http_requests_total, sb_cluster)",
         "hide": 0,
         "includeAll": true,
         "label": null,
         "multi": false,
         "name": "cluster",
         "options": [],
-        "query": "label_values(nginx_http_requests_total, cluster)",
+        "query": "label_values(nginx_http_requests_total, sb_cluster)",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
@@ -419,7 +419,6 @@
   },
   "timepicker": {
     "refresh_intervals": [
-      "5s",
       "10s",
       "30s",
       "1m",
diff --git a/pipelines/provision/cassandra/Jenkinsfile.exporter b/pipelines/provision/cassandra/Jenkinsfile.exporter
new file mode 100644
index 000000000..c240cfb38
--- /dev/null
+++ b/pipelines/provision/cassandra/Jenkinsfile.exporter
@@ -0,0 +1,51 @@
+@Library('deploy-conf') _
+node() {
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        stage('checkout public repo') {
+            folder = new File("$WORKSPACE/.git")
+            if (folder.exists())
+            {
+               println "Found .git folder. Clearing it.."
+               sh'git clean -fxd'
+            }
+            checkout scm
+        }
+
+        ansiColor('xterm') {
+            stage('deploy'){
+                values = [:]
+                currentWs = sh(returnStdout: true, script: 'pwd').trim()
+                envDir = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-3].trim()
+                module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim()
+                jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
+                ansiblePlaybook = "${currentWs}/ansible/cassandra-exporter.yaml"
+                ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass -v"
+                values.put('currentWs', currentWs)
+                values.put('env', envDir)
+                values.put('module', module)
+                values.put('jobName', jobName)
+                values.put('ansiblePlaybook', ansiblePlaybook)
+                values.put('ansibleExtraArgs', ansibleExtraArgs)
+                println values
+                ansible_playbook_run(values)
+                currentBuild.result = 'SUCCESS'
+                currentBuild.description = "Private: ${params.private_branch}, Public: ${params.branch_or_tag}"
+            }
+        }
+         summary()
+     }
+    catch (err) {
+        currentBuild.result = 'FAILURE'
+        throw err
+    }    
+    finally {
+        slack_notify(currentBuild.result)
+        email_notify()
+    }
+} 

From ddd117aa7cdc5f368ea876dd95e30b46e668e482 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Fri, 13 Nov 2020 10:02:49 +0530
Subject: [PATCH 034/184] fix: nginx service annotation (#2040)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../core/nginx-public-ingress/templates/daemonset.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml b/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
index 96968c090..9b46899ba 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
@@ -84,7 +84,7 @@ kind: Service
 metadata:
   name: nginx-public-ingress
   namespace: {{ .Values.namespace }}
-{{- if service.annotations }}
+{{- if .Values.service.annotations }}
   annotations:
 {{ toyaml .Values.service.annotations | indent 4 }}
 {{- end }}

From 492da1703bb6faf898de4666c5fe7d05afc842f6 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Fri, 13 Nov 2020 10:14:38 +0530
Subject: [PATCH 035/184] fix: empty service annotation (#2041)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../core/nginx-public-ingress/templates/daemonset.yaml          | 2 +-
 kubernetes/helm_charts/core/nginx-public-ingress/values.j2      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml b/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
index 9b46899ba..9fc5ce4cf 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml
@@ -86,7 +86,7 @@ metadata:
   namespace: {{ .Values.namespace }}
 {{- if .Values.service.annotations }}
   annotations:
-{{ toyaml .Values.service.annotations | indent 4 }}
+{{ toYaml .Values.service.annotations | indent 4 }}
 {{- end }}
 spec:
   externalTrafficPolicy: Local
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index f2d7a931c..07abf6f6e 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -3,7 +3,7 @@
 namespace: {{ namespace }}
 merge_domain_status: {{ merge_domain_status | lower }}
 service:
-  annotations: {{nginx_public_ingress_service_annotations | d('{}')  | to_json}}
+  annotations: {{nginx_public_ingress_service_annotations | d('')  | to_json}}
   type: {{ nginx_public_ingress_type | default('LoadBalancer') }}
   {% if nginx_public_ingress_ip is defined %}
   nginx_public_ingress_ip: {{ nginx_public_ingress_ip }}

From 6f501363cc267cad8190c35b74435cf2fe552488 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Fri, 13 Nov 2020 10:24:01 +0530
Subject: [PATCH 036/184] fix: default value for druid entry (#2042)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../roles/sunbird-monitoring/templates/alertrules.yaml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
index 62ad4633d..4971aff4d 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
@@ -56,8 +56,8 @@ raw_druid_datasource:
   - sl_observations_production
   - telemetry-feedback-events
 
-druid_raw_ingestion_threshold: "{{ druid_raw_ingestion_lag_threshold | defaut(200000) }}"
-druid_rollup_ingestion_threshold: "{{ druid_rollup_ingestion_lag_threshold  | defaut(200000)}}"
+druid_raw_ingestion_threshold: "{{ druid_raw_ingestion_lag_threshold | default(200000) }}"
+druid_rollup_ingestion_threshold: "{{ druid_rollup_ingestion_lag_threshold  | default(200000)}}"
 
 secor_process_names:
   - channel-telemetry-backup

From 2b9e37bd6a65c4b668aca11150e11a4e5ce432ae Mon Sep 17 00:00:00 2001
From: Rhea Fernandes <32357913+rheafernandes@users.noreply.github.com>
Date: Wed, 18 Nov 2020 17:47:31 +0530
Subject: [PATCH 037/184] Added categories in configuration for channel apis
 (#2043)

* Added Kafka Configuration for assessment service
---
 .../assessment-service_application.conf       |  6 ++++++
 .../content-service_application.conf          | 20 +++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
index efdbefc28..9cd36c459 100644
--- a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
@@ -370,3 +370,9 @@ languageCode {
   tamil : "ta"
   telugu : "te"
 }
+
+kafka {
+  urls : "{{ kafka_urls }}"
+  topic.send.enable : true
+  topics.instruction : "{{ env_name }}.learning.job.request"
+}
\ No newline at end of file
diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index fb31f84f4..21b453f76 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -560,8 +560,20 @@ mimeTypeToPrimaryCategory {
   "text/x-url": ["Learnin Resource", "Teacher Resource"]
 }
 
-#Default objectCategory mapping for channel
-channel.content.primarycategories=["Explanation Content", "Learning Resource", "Practice Question Set", "eTextbook", "Teacher Resource", "Course Assessment"]
-channel.collection.primarycategories=["Course", "Digital Textbook", "Content Playlist"]
-channel.asset.primarycategories=["Asset"]
 objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_store"
+
+#Default objectCategory mapping for channel
+channel {
+  content{
+    primarycategories=["Course Assessment", "eTextbook", "Explanation Content", "Learning Resource", "Practice Question Set", "Teacher Resource"]
+    additionalcategories=["Classroom Teaching Video", "Concept Map", "Curiosity Question Set", "Experiential Resource", "Explanation Video", "Focus Spot", "Learning Outcome Definition", "Lesson Plan", "Marking Scheme Rubric", "Pedagogy Flow", "Previous Board Exam Papers", "TV Lesson", "Textbook"]
+  }
+  collection {
+    primarycategories=["Content Playlist", "Course", "Digital Textbook"]
+    additionalcategories=["Textbook", "Lesson Plan"]
+  }
+  asset {
+    primarycategories=["Asset", "CertAsset", "Certificate Template"]
+    additionalcategories=[]
+  }
+}
\ No newline at end of file

From f5b934bcfca94911e3f6f469d8f93b6659d5d730 Mon Sep 17 00:00:00 2001
From: Rhea Fernandes <32357913+rheafernandes@users.noreply.github.com>
Date: Thu, 19 Nov 2020 16:34:37 +0530
Subject: [PATCH 038/184] SB-21507 Required changes made for TV Lesson
 collection object Type (#2045)

---
 .../stack-sunbird/templates/content-service_application.conf  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index 21b453f76..814b9ed22 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -569,8 +569,8 @@ channel {
     additionalcategories=["Classroom Teaching Video", "Concept Map", "Curiosity Question Set", "Experiential Resource", "Explanation Video", "Focus Spot", "Learning Outcome Definition", "Lesson Plan", "Marking Scheme Rubric", "Pedagogy Flow", "Previous Board Exam Papers", "TV Lesson", "Textbook"]
   }
   collection {
-    primarycategories=["Content Playlist", "Course", "Digital Textbook"]
-    additionalcategories=["Textbook", "Lesson Plan"]
+    primarycategories=["Content Playlist", "Course", "Digital Textbook", "Explanation Content"]
+    additionalcategories=["Textbook", "Lesson Plan", "TV Lesson"]
   }
   asset {
     primarycategories=["Asset", "CertAsset", "Certificate Template"]

From 01e62960ac90cf7fffc5e9b70c8931b74b349fd2 Mon Sep 17 00:00:00 2001
From: Harsha <harshavardhanc95@gmail.com>
Date: Fri, 20 Nov 2020 13:36:23 +0530
Subject: [PATCH 039/184] updating dockerfile with plugins (#2047)

---
 pipelines/build/nodebb/Dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pipelines/build/nodebb/Dockerfile b/pipelines/build/nodebb/Dockerfile
index eea8d41c1..104c3d913 100644
--- a/pipelines/build/nodebb/Dockerfile
+++ b/pipelines/build/nodebb/Dockerfile
@@ -11,9 +11,11 @@ RUN npm install --only=prod && \
     npm cache clean --force
 
 
-RUN npm install https://github.com/vrayulu/nodebb-plugin-sunbird-oidc.git
-RUN npm install https://github.com/ankitv89/nodebb-plugin-create-forum
-RUN npm install https://github.com/bandanasahu123/nodebb-plugin-for-telemetry
+RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-oidc.git
+RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-api.git
+RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-telemetry.git
+RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-azure-storage.git
+
 
 
 

From 6a2670fc252089fff317325ca0100ae57e08b940 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Fri, 20 Nov 2020 14:03:00 +0530
Subject: [PATCH 040/184] Compressing cached endpoints (#2048)

* Adding common compression block

* Compressing cached API

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../templates/configMap.yaml                  |   2 +
 .../core/nginx-public-ingress/values.j2       | 130 +++++++++---------
 2 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/templates/configMap.yaml b/kubernetes/helm_charts/core/nginx-public-ingress/templates/configMap.yaml
index ef909bb6a..87f6b5716 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/templates/configMap.yaml
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/templates/configMap.yaml
@@ -6,6 +6,8 @@ metadata:
 data:
   proxy-default.conf: |
 {{ .Values.proxyconfig | indent 4 }}
+  compression.conf: |
+{{ .Values.compressionConfig | indent 4 }}
 
 ---
 apiVersion: v1
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 07abf6f6e..d3817b724 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -185,8 +185,11 @@ proxyconfig: |-
     }
     # This is Caching mechanism for POST requests location search
     location ~ /learner/data/v1/location/search {
+      # Enabling compression
+      include /etc/nginx/defaults.d/compression.conf;
       # Enabling caching
-      proxy_cache_key "$request_uri|$request_body";
+      # caching include Accept-Encoding header also, to provide gziped or plain content as per request
+      proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
       proxy_cache framework_cache;
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
@@ -210,8 +213,11 @@ proxyconfig: |-
     }
     # Caching for content consumption
     location ~ /api/(content/v1/read|course/v1/hierarchy) {
+      # Enabling compression
+      include /etc/nginx/defaults.d/compression.conf;
       # Enabling caching
-      proxy_cache_key "$request_uri|$request_body";
+      # caching include Accept-Encoding header also, to provide gziped or plain content as per request
+      proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
       proxy_cache content_cache;
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
@@ -237,8 +243,11 @@ proxyconfig: |-
     }
     # This is Caching mechanism for Content search
     location ~ /api/content/v1/search {
+      # Enabling compression
+      include /etc/nginx/defaults.d/compression.conf;
       # Enabling caching
-      proxy_cache_key "$request_uri|$request_body";
+      # caching include Accept-Encoding header also, to provide gziped or plain content as per request
+      proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
       proxy_cache content_cache;
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
@@ -264,8 +273,11 @@ proxyconfig: |-
     }
     # This is Caching mechanism for POST requests
     location ~ /api/org/v1/search|/api/data/v1/(form/read|location/search) {
+      # Enabling compression
+      include /etc/nginx/defaults.d/compression.conf;
       # Enabling caching
-      proxy_cache_key "$request_uri|$request_body";
+      # caching include Accept-Encoding header also, to provide gziped or plain content as per request
+      proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
       proxy_cache framework_cache;
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
@@ -289,8 +301,11 @@ proxyconfig: |-
       proxy_pass http://kong;
     }
     location ~ /api/(framework/v1/read|data/v1/system/settings/get) {
+      # Enabling compression
+      include /etc/nginx/defaults.d/compression.conf;
       # Enabling caching
-      proxy_cache_key $proxy_host$request_uri;
+      # caching include Accept-Encoding header also, to provide gziped or plain content as per request
+      proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
       proxy_cache framework_cache;
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
@@ -327,34 +342,7 @@ proxyconfig: |-
       if ( $http_authorization ) {
         set $custom_header "$http_authorization";
       }
-      # Compression                                           
-      gzip on;                                                
-      gzip_comp_level    5;                                   
-      gzip_min_length    256; # 256Bytes
-      gzip_proxied       any;                                 
-      gzip_vary          on;                                  
-      # Content types for compression                         
-      gzip_types                                              
-      application/atom+xml                                    
-      application/javascript                                  
-      application/json                                        
-      application/ld+json                                     
-      application/manifest+json                               
-      application/rss+xml                                     
-      application/vnd.geo+json                                
-      application/vnd.ms-fontobject                           
-      application/x-font-ttf                                  
-      application/x-web-app-manifest+json                     
-      application/xhtml+xml                                   
-      application/xml                                         
-      font/opentype                                           
-      image/bmp                                               
-      image/svg+xml                                           
-      image/x-icon                                            
-      text/cache-manifest                                     
-      text/css                                                
-      text/plain                                              
-      #
+      include /etc/nginx/defaults.d/compression.conf;
       proxy_set_header Authorization $custom_header;
       rewrite ^/api/(.*) /$1 break;
       proxy_set_header Connection "";
@@ -737,34 +725,7 @@ proxyconfig: |-
     # compression for svg certs download                      
     location /api/certreg/v2/certs/download {                 
       rewrite ^/api/(.*) /$1 break;                           
-      # Compression                                           
-      gzip on;                                                
-      gzip_comp_level    5;                                   
-      gzip_min_length    50000; # 50KB                                
-      gzip_proxied       any;                                 
-      gzip_vary          on;                                  
-      # Content types for compression                         
-      gzip_types                                              
-      application/atom+xml                                    
-      application/javascript                                  
-      application/json                                        
-      application/ld+json                                     
-      application/manifest+json                               
-      application/rss+xml                                     
-      application/vnd.geo+json                                
-      application/vnd.ms-fontobject                           
-      application/x-font-ttf                                  
-      application/x-web-app-manifest+json                     
-      application/xhtml+xml                                   
-      application/xml                                         
-      font/opentype                                           
-      image/bmp                                               
-      image/svg+xml                                           
-      image/x-icon                                            
-      text/cache-manifest                                     
-      text/css                                                
-      text/plain                                              
-      add_header test hello;                                  
+      include /etc/nginx/defaults.d/compression.conf;
       proxy_set_header Connection "";                         
       proxy_set_header Host $host;                            
       proxy_set_header X-Real-IP $remote_addr;                
@@ -859,7 +820,11 @@ proxyconfig: |-
       proxy_read_timeout 70;
     }
     location  ~ /resourcebundles/v1/read|/learner/data/v1/(role/read|system/settings/get)|/v1/tenant/info  {
-      proxy_cache_key $proxy_host$request_uri;
+      # Enabling compression
+      include /etc/nginx/defaults.d/compression.conf;
+      # Enabling caching
+      # caching include Accept-Encoding header also, to provide gziped or plain content as per request
+      proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
       proxy_cache framework_cache;
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
@@ -877,7 +842,11 @@ proxyconfig: |-
       proxy_pass http://player;
     }
     location /api/channel/v1/read {
-      proxy_cache_key $proxy_host$request_uri;
+      # Enabling compression
+      include /etc/nginx/defaults.d/compression.conf;
+      # Enabling caching
+      # caching include Accept-Encoding header also, to provide gziped or plain content as per request
+      proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
       proxy_cache framework_cache;
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
@@ -1126,8 +1095,11 @@ keycloakconf: |
     }
     # Static Assets for keycloak endpoints with caching
     location ~ /auth/(resources/(.+\.(png|svg|ico|js|eot|ttf|woff|woff2|css))|welcome-content/(.+\.(png|svg|ico|js|eot|ttf|woff|woff2|css))) {
+      # Enabling compression
+      include /etc/nginx/defaults.d/compression.conf;
       # Enabling caching
-      proxy_cache_key $proxy_host$request_uri;
+      # caching include Accept-Encoding header also, to provide gziped or plain content as per request
+      proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
       proxy_cache proxy_cache;
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
@@ -1164,6 +1136,36 @@ keycloakconf: |
     }
   }
 
+compressionConfig: |-
+  # Compression                                           
+  gzip on;                                                
+  gzip_comp_level    5;                                   
+  gzip_min_length    256; # 256Bytes
+  gzip_proxied       any;                                 
+  gzip_vary          on;                                  
+  # Content types for compression                         
+  gzip_types                                              
+  application/atom+xml                                    
+  application/javascript                                  
+  application/json                                        
+  application/ld+json                                     
+  application/manifest+json                               
+  application/rss+xml                                     
+  application/vnd.geo+json                                
+  application/vnd.ms-fontobject                           
+  application/x-font-ttf                                  
+  application/x-web-app-manifest+json                     
+  application/xhtml+xml                                   
+  application/xml                                         
+  font/opentype                                           
+  image/bmp                                               
+  image/svg+xml                                           
+  image/x-icon                                            
+  text/cache-manifest                                     
+  text/css                                                
+  text/plain                                              
+  ;
+
 serviceMonitor:
   enabled: true
   labels: # labels with which the prometheus choose the serviceMonitor

From 1bde79b1f35afd78bff93d510d2c113869990afb Mon Sep 17 00:00:00 2001
From: Mahesh Kumar Gangula <maheshkumargangula@users.noreply.github.com>
Date: Sat, 21 Nov 2020 12:58:40 +0530
Subject: [PATCH 041/184] H5P Library update (#2051)

* Issue #000 fix: h5p lib update.

* Issue #000 fix: define a variable.
---
 .../stack-sunbird/templates/content-service_application.conf    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index 814b9ed22..b49da3076 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -375,7 +375,7 @@ content {
   }
   h5p {
     library {
-      path: "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/content/templates/h5p-library-latest.zip"
+      path: "{{ h5p_library_path | default('https://sunbirddev.blob.core.windows.net/sunbird-content-dev/h5p-standalone-1.3.4.zip') }}"
     }
   }
   copy {

From 097ee97519c8ad9fdde83e6e052659e047241add Mon Sep 17 00:00:00 2001
From: Kumar Gauraw <gaurawk@ilimi.in>
Date: Mon, 23 Nov 2020 09:53:47 +0530
Subject: [PATCH 042/184] Issue #SB-21521 fix: updated config for collection
 categories (#2050)

---
 .../stack-sunbird/templates/content-service_application.conf  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index b49da3076..c48ecb69b 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -569,8 +569,8 @@ channel {
     additionalcategories=["Classroom Teaching Video", "Concept Map", "Curiosity Question Set", "Experiential Resource", "Explanation Video", "Focus Spot", "Learning Outcome Definition", "Lesson Plan", "Marking Scheme Rubric", "Pedagogy Flow", "Previous Board Exam Papers", "TV Lesson", "Textbook"]
   }
   collection {
-    primarycategories=["Content Playlist", "Course", "Digital Textbook", "Explanation Content"]
-    additionalcategories=["Textbook", "Lesson Plan", "TV Lesson"]
+    primarycategories=["Content Playlist", "Course", "Digital Textbook"]
+    additionalcategories=["Textbook", "Lesson Plan"]
   }
   asset {
     primarycategories=["Asset", "CertAsset", "Certificate Template"]

From 23c186450adc9f045782271f3874499edeaca109 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Mon, 23 Nov 2020 16:12:57 +0530
Subject: [PATCH 043/184] Caching course/v1/batch/read (#2049)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 kubernetes/helm_charts/core/nginx-public-ingress/values.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index d3817b724..472077e83 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -212,7 +212,7 @@ proxyconfig: |-
       proxy_pass http://player;
     }
     # Caching for content consumption
-    location ~ /api/(content/v1/read|course/v1/hierarchy) {
+    location ~ /api/(content/v1/read|course/v1/hierarchy|course/v1/batch/read) {
       # Enabling compression
       include /etc/nginx/defaults.d/compression.conf;
       # Enabling caching

From 05192e6738813439b99183721a4eb01835efde20 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Mon, 23 Nov 2020 20:17:52 +0530
Subject: [PATCH 044/184] Nginx logging improvements (#2052)

* changing nginx recording rule to irate from rate

irate will take consecutive 2 data points and more accurate than rate
function.

ref: https://www.robustperception.io/irate-graphs-are-better-graphs

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Removing istio and helm exporter metrics.

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Adding wild card match to capture all unaccounted log entries.

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Nginx exposing interface to enable custom logging

for example, in ansible overrides below entry will log all
Accept-Encoding headers.

nginx_additional_log_fields: '"$http_accept_encoding"'

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../templates/additional-scrape-configs.yaml  | 137 ------------------
 .../templates/recordingRules.yaml             |  10 +-
 .../core/nginx-public-ingress/values.j2       |   2 +-
 .../fluent-bit/templates/configMap.yaml       |   6 +-
 4 files changed, 10 insertions(+), 145 deletions(-)

diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml
index 0af9d7c5f..e5eb3a5c7 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml
@@ -68,143 +68,6 @@ scrapeconfig:
       - targets:  ["{{ groups['druid'] | difference(["localhost"]) | map('regex_replace', '^(.*)$', '\\1:9108' ) | list | join("\", \"") }}"]  
 {% endif %}
 
-  
-  - job_name: 'helm-exporter'
-    static_configs:
-      - targets: ['helm-exporter.monitoring.svc.cluster.local:9571']
-  # Istio metrics
-  - job_name: istio-mesh
-    scrape_interval: 15s
-    scrape_timeout: 10s
-    metrics_path: /metrics
-    scheme: http
-    kubernetes_sd_configs:
-    - role: endpoints
-      namespaces:
-        names:
-        - istio-system
-    relabel_configs:
-    - source_labels: [__meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
-      separator: ;
-      regex: istio-telemetry;prometheus
-      replacement: $1
-      action: keep
-  - job_name: envoy-stats
-    scrape_interval: 15s
-    scrape_timeout: 10s
-    metrics_path: /stats/prometheus
-    scheme: http
-    kubernetes_sd_configs:
-    - role: pod
-    relabel_configs:
-    - source_labels: [__meta_kubernetes_pod_container_port_name]
-      separator: ;
-      regex: .*-envoy-prom
-      replacement: $1
-      action: keep
-    - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
-      separator: ;
-      regex: ([^:]+)(?::\d+)?;(\d+)
-      target_label: __address__
-      replacement: $1:15090
-      action: replace
-    - separator: ;
-      regex: __meta_kubernetes_pod_label_(.+)
-      replacement: $1
-      action: labelmap
-    - source_labels: [__meta_kubernetes_namespace]
-      separator: ;
-      regex: (.*)
-      target_label: namespace
-      replacement: $1
-      action: replace
-    - source_labels: [__meta_kubernetes_pod_name]
-      separator: ;
-      regex: (.*)
-      target_label: pod_name
-      replacement: $1
-      action: replace
-  - job_name: istio-policy
-    scrape_interval: 15s
-    scrape_timeout: 10s
-    metrics_path: /metrics
-    scheme: http
-    kubernetes_sd_configs:
-    - role: endpoints
-      namespaces:
-        names:
-        - istio-system
-    relabel_configs:
-    - source_labels: [__meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
-      separator: ;
-      regex: istio-policy;http-monitoring
-      replacement: $1
-      action: keep
-  - job_name: istio-telemetry
-    scrape_interval: 15s
-    scrape_timeout: 10s
-    metrics_path: /metrics
-    scheme: http
-    kubernetes_sd_configs:
-    - role: endpoints
-      namespaces:
-        names:
-        - istio-system
-    relabel_configs:
-    - source_labels: [__meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
-      separator: ;
-      regex: istio-telemetry;http-monitoring
-      replacement: $1
-      action: keep
-  - job_name: pilot
-    scrape_interval: 15s
-    scrape_timeout: 10s
-    metrics_path: /metrics
-    scheme: http
-    kubernetes_sd_configs:
-    - role: endpoints
-      namespaces:
-        names:
-        - istio-system
-    relabel_configs:
-    - source_labels: [__meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
-      separator: ;
-      regex: istio-pilot;http-monitoring
-      replacement: $1
-      action: keep
-  - job_name: galley
-    scrape_interval: 15s
-    scrape_timeout: 10s
-    metrics_path: /metrics
-    scheme: http
-    kubernetes_sd_configs:
-    - role: endpoints
-      namespaces:
-        names:
-        - istio-system
-    relabel_configs:
-    - source_labels: [__meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
-      separator: ;
-      regex: istio-galley;http-monitoring
-      replacement: $1
-      action: keep
-  - job_name: citadel
-    scrape_interval: 15s
-    scrape_timeout: 10s
-    metrics_path: /metrics
-    scheme: http
-    kubernetes_sd_configs:
-    - role: endpoints
-      namespaces:
-        names:
-        - istio-system
-    relabel_configs:
-    - source_labels: [__meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
-      separator: ;
-      regex: istio-citadel;http-monitoring
-      replacement: $1
-      action: keep
-
   - job_name: 'redis_exporter_targets'
     static_configs:
       - targets: ["{{ groups['redis-exporter-targets'] | difference(["localhost"]) | map('regex_replace', '^(.*)$', '\\1:6379') | list | join("\", \"") }}"]
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/templates/recordingRules.yaml b/kubernetes/helm_charts/core/nginx-public-ingress/templates/recordingRules.yaml
index 5347313e2..1701d0833 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/templates/recordingRules.yaml
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/templates/recordingRules.yaml
@@ -12,10 +12,12 @@ spec:
   groups:
   - name: nginx-recording.rules
     rules:
-    - expr: sum(rate(nginx_http_requests_total[5m])) by (cache_status, host, env, status)
-      record: job:nginx_http_requests_total:rate:sum:5m
-    - expr: sum(rate(nginx_http_requests_total[15m])) by (cache_status, host, env, status)
-      record: job:nginx_http_requests_total:rate:sum:15m
+    - expr: sum(irate(nginx_http_requests_total[1m])) by (cache_status, host, env, status)
+      record: job:nginx_http_requests_total:irate:sum:1m
+    - expr: sum(irate(nginx_http_requests_total[5m])) by (cache_status, host, env, status)
+      record: job:nginx_http_requests_total:irate:sum:5m
+    - expr: sum(irate(nginx_http_requests_total[15m])) by (cache_status, host, env, status)
+      record: job:nginx_http_requests_total:irate:sum:15m
     - record: job:nginx_http_success_percentage:increase:sum:5m
       expr: |-
         (
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 472077e83..35c95435a 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -932,7 +932,7 @@ nginxconfig: |
                         ' $request_time $upstream_response_time $pipe'
                         ' "$http_referer" "$http_user_agent" "$sb_request_id"'
                         ' "$http_x_device_id" "$http_x_channel_id" "$http_x_app_id"'
-                        ' "$http_x_app_ver" "$http_x_session_id"';
+                        ' "$http_x_app_ver" "$http_x_session_id" {{nginx_additional_log_fields | default("")}}';
       access_log  /var/log/nginx/access.log  main;
       # Shared dictionary to store metrics
       lua_shared_dict prometheus_metrics 100M;
diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
index b6fab89e3..8c3579e20 100644
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
+++ b/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
@@ -22,7 +22,7 @@ data:
         Merge_Parser        catchall
         # Don't need merged logs
         # More over, we're using custom parser, which catch all and tag it as log
-        Keep_Log            Off
+        Keep_Log            Off 
         # Annotate pod to select the parser
         # annotaions:
         #   fluentbit.io/parsers: nginx2
@@ -141,8 +141,8 @@ data:
     [PARSER]
         Name        nginx2
         Format      regex
-        # https://rubular.com/r/ZSLRpLS1B4XFbC
-        Regex       ^(?<n_cip>[^ ]*) (?<n_host>[^ ]*) (?<n_uid>[^ ]*) \[(?<n_time>[^\]]*)\] "(?<n_verb>\S+)(?: +(?<n_path>[^\"]*?)(?: +\S*)?)?" (?<n_rscode>[^ ]*) (?<n_rqsize>[^ ]*) (?<n_rssize>[^ ]*) (?<n_rqtime>[^ ]+) (?<n_rstime>[^ ]+) (?<n_pipe>\.*) (?:"(?<n_referer>[^\"]*)" "(?<n_agent>[^\"]*)") "(?<n_tid>[^\"]*)" "(?<n_did>[^\"]*)" "(?<n_cid>[^\"]*)" "(?<n_aid>[^\"]*)" "(?<n_aver>[^\"]*)" "(?<n_sid>[^\"]*)"
+        # https://rubular.com/r/IWnYbkLpdRI8Jh
+        Regex       ^(?<n_cip>[^ ]*) (?<n_host>[^ ]*) (?<n_uid>[^ ]*) \[(?<n_time>[^\]]*)\] "(?<n_verb>\S+)(?: +(?<n_path>[^\"]*?)(?: +\S*)?)?" (?<n_rscode>[^ ]*) (?<n_rqsize>[^ ]*) (?<n_rssize>[^ ]*) (?<n_rqtime>[^ ]+) (?<n_rstime>[^ ]+) (?<n_pipe>\.*) (?:"(?<n_referer>[^\"]*)" "(?<n_agent>[^\"]*)") "(?<n_tid>[^\"]*)" "(?<n_did>[^\"]*)" "(?<n_cid>[^\"]*)" "(?<n_aid>[^\"]*)" "(?<n_aver>[^\"]*)" "(?<n_sid>[^\"]*)"\s*(?<n_raw>.*)$
         Time_Key    time
         Types       n_rstime:float n_rqtime:float n_rssize:integer n_rqsize:integer
         Time_Format %d/%b/%Y:%H:%M:%S %z

From 31eac672097f0d2c57efcf7260fdbd96f9f60a4d Mon Sep 17 00:00:00 2001
From: Manjunath Davanam <manjunathd@ilimi.in>
Date: Wed, 25 Nov 2020 11:44:24 +0530
Subject: [PATCH 045/184]  KP & DP flink jobs grafana dashboard (#2054)

* Issue #000 fix: KP flink jobs grafana update

* Issue #000 fix: KP flink jobs grafana update

* Issue #000 fix: Dp flink dashboard setup
---
 .../dp-flink-jobs-metrics-dashboard.json      |  5902 ++++++++
 .../dashboards/dp-flink-lag-dashboard.json    | 12517 ++++++++++++++++
 .../kp-flink-jobs-metrics-dashboard.json      |   350 +-
 .../monitoring/dashboards/values.yaml         |     4 +
 4 files changed, 18699 insertions(+), 74 deletions(-)
 create mode 100644 kubernetes/helm_charts/monitoring/dashboards/dashboards/dp-flink-jobs-metrics-dashboard.json
 create mode 100644 kubernetes/helm_charts/monitoring/dashboards/dashboards/dp-flink-lag-dashboard.json

diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/dp-flink-jobs-metrics-dashboard.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/dp-flink-jobs-metrics-dashboard.json
new file mode 100644
index 000000000..049b371f4
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/dp-flink-jobs-metrics-dashboard.json
@@ -0,0 +1,5902 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 39,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 74,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 5,
+            "w": 6,
+            "x": 0,
+            "y": 2
+          },
+          "id": 78,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"ingest-router-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Ingestion Router lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 5,
+            "w": 12,
+            "x": 6,
+            "y": 2
+          },
+          "hiddenSeries": false,
+          "id": 76,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"ingest-router-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "IngestRouter lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:458",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:459",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Ingest Router",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 1
+      },
+      "id": 2,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 0,
+            "y": 11
+          },
+          "id": 4,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_TelemetryExtractorJob_success_batch_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Extractor Success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#E02F44"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 6,
+            "y": 11
+          },
+          "id": 6,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_TelemetryExtractorJob_duplicate_event_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Extractor Duplicates",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#E02F44"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 12,
+            "y": 11
+          },
+          "id": 59,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_TelemetryExtractorJob_success_event_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Raw Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#299c46"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 18,
+            "y": 11
+          },
+          "id": 5,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_TelemetryExtractorJob_failed_batch_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Extractor Failed",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 15
+          },
+          "hiddenSeries": false,
+          "id": 10,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_TelemetryExtractorJob_success_event_count)",
+              "format": "time_series",
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "ExtractorSuccess",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_TelemetryExtractorJob_duplicate_event_count)",
+              "interval": "",
+              "legendFormat": "ExtractorDuplicates",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_TelemetryExtractorJob_failed_batch_count)",
+              "interval": "",
+              "legendFormat": "ExtractorFailed",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Telemetry Extractor",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:162",
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:163",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 15
+          },
+          "hiddenSeries": false,
+          "id": 12,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"telemetry-extractor-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "TelemetryExtractor lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:378",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:379",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "TelemetryExtractor",
+      "type": "row"
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 2
+      },
+      "id": 14,
+      "panels": [],
+      "title": "Pipeline Preprocessor",
+      "type": "row"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 0,
+        "y": 3
+      },
+      "id": 16,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_success_event_count[$__range])) + sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_failed_event_count[$__range])) ",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Raw Events",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 5,
+        "y": 3
+      },
+      "id": 61,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_unique_event_count[$__range]))",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Unique Events",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "decimals": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 10,
+        "y": 3
+      },
+      "id": 60,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_duplicate_event_count[$__range]))",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Duplicate Events",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 15,
+        "y": 3
+      },
+      "id": 22,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_failed_event_count[$__range]))",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Invalid Events",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#d44a3a",
+        "rgba(237, 129, 40, 0.89)",
+        "#299c46"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 20,
+        "y": 3
+      },
+      "id": 67,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_failed_event_count[$__range])) / (sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_failed_event_count[$__range])) +sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_success_event_count[$__range]))) * 100",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Invalid Events %",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 0,
+        "y": 7
+      },
+      "id": 21,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_primary_route_success_count[$__range])) + sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_share_item_event_success_count[$__range]))",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Primary Events",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 5,
+        "y": 7
+      },
+      "id": 23,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_audit_route_success_count[$__range]))",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Audit Events",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 10,
+        "y": 7
+      },
+      "id": 17,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_log_route_success_count[$__range]))",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Log Events",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 15,
+        "y": 7
+      },
+      "id": 19,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_share_route_success_count[$__range]))",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Share Events",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 20,
+        "y": 7
+      },
+      "id": 18,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_error_route_success_count[$__range]))",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Error Events",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 11
+      },
+      "hiddenSeries": false,
+      "id": 25,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": true,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_primary_route_success_count)",
+          "interval": "",
+          "legendFormat": "Primary Events",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_log_route_success_count)",
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "Log Events",
+          "refId": "B"
+        },
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_error_route_success_count)",
+          "interval": "",
+          "legendFormat": "Error Events",
+          "refId": "C"
+        },
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_audit_route_success_count)",
+          "interval": "",
+          "legendFormat": "Audit Events",
+          "refId": "D"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Pipeline Preprocessor",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 11
+      },
+      "hiddenSeries": false,
+      "id": 29,
+      "legend": {
+        "avg": false,
+        "current": true,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"pipeline-preprocessor-taskmanager-prometheus\" })",
+          "interval": "",
+          "legendFormat": "Consumer lag",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Preprocessor lag",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 19
+      },
+      "id": 99,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 2
+          },
+          "id": 100,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_device_cache_hit{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Device meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 2
+          },
+          "id": 101,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_user_cache_hit{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "User meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 2
+          },
+          "id": 102,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_dialcode_cache_hit{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Dialcode meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 2
+          },
+          "id": 103,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_content_cache_hit{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Content meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 2
+          },
+          "id": 104,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_loc_cache_hit{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Location meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#299c46"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 2
+          },
+          "id": 120,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "Expired events",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_events_expired{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "Expired events",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Expired Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 0,
+            "y": 6
+          },
+          "id": 106,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_device_cache_miss{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Device meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 5,
+            "y": 6
+          },
+          "id": 107,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_user_cache_miss{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "User meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 10,
+            "y": 6
+          },
+          "id": 108,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_dialcode_cache_miss{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Dialcode meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 15,
+            "y": 6
+          },
+          "id": 109,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_content_cache_miss{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Content meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 6
+          },
+          "id": 110,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_loc_cache_miss{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Location meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 10
+          },
+          "hiddenSeries": false,
+          "id": 111,
+          "interval": "",
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DenormalizationJob_loc_total{job=\"de-normalization-primary-taskmanager-prometheus\"})",
+              "interval": "",
+              "legendFormat": "Denorm success",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DenormalizationPrimary",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:1090",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:1091",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 10
+          },
+          "hiddenSeries": false,
+          "id": 112,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"de-normalization-primary-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DenormalizationPrimary lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:1018",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:1019",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "DenormalizationPrimary",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 20
+      },
+      "id": 114,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 1
+          },
+          "id": 115,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_device_cache_hit{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Device meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 1
+          },
+          "id": 116,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_user_cache_hit{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "User meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 1
+          },
+          "id": 117,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_dialcode_cache_hit{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Dialcode meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 1
+          },
+          "id": 118,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_content_cache_hit{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Content meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 1
+          },
+          "id": 119,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_loc_cache_hit{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Location meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#299c46"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 1
+          },
+          "id": 105,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "Expired events",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_events_expired{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "Expired events",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Expired Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 0,
+            "y": 5
+          },
+          "id": 121,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_device_cache_miss{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Device meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 5,
+            "y": 5
+          },
+          "id": 122,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_user_cache_miss{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "User meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 10,
+            "y": 5
+          },
+          "id": 123,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_dialcode_cache_miss{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Dialcode meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 15,
+            "y": 5
+          },
+          "id": 124,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_content_cache_miss{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Content meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 5
+          },
+          "id": 125,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_loc_cache_miss{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Location meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 9
+          },
+          "hiddenSeries": false,
+          "id": 126,
+          "interval": "",
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DenormalizationJob_loc_total{job=\"de-normalization-secondary-taskmanager-prometheus\"})",
+              "interval": "",
+              "legendFormat": "Denorm success",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DenormalizationSecondary",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:1090",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:1091",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 9
+          },
+          "hiddenSeries": false,
+          "id": 127,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"de-normalization-secondary-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DenormalizationSecondarylag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:1018",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:1019",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "DenormalizationSecondary",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 21
+      },
+      "id": 44,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 0,
+            "y": 16
+          },
+          "id": 46,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DruidValidatorJob_telemetry_route_success_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Telemetry Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 6,
+            "y": 16
+          },
+          "id": 47,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DruidValidatorJob_summary_route_success_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Summary Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 12,
+            "y": 16
+          },
+          "id": 48,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DruidValidatorJob_validation_failed_message_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Validation Failed",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 18,
+            "y": 16
+          },
+          "id": 49,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DruidValidatorJob_duplicate_event_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Duplicate Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 20
+          },
+          "hiddenSeries": false,
+          "id": 53,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DruidValidatorJob_telemetry_route_success_count)",
+              "interval": "",
+              "legendFormat": "Telemetry Events",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DruidValidatorJob_summary_route_success_count)",
+              "interval": "",
+              "legendFormat": "Summary Events",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DruidValidatorJob_validation_failed_message_count)",
+              "interval": "",
+              "legendFormat": "Validation failed",
+              "refId": "C"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DruidValidatorJob_duplicate_event_count)",
+              "interval": "",
+              "legendFormat": "Duplicate Events",
+              "refId": "D"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Druid Validator",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 20
+          },
+          "hiddenSeries": false,
+          "id": 52,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"druid-validator-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DruidValidator lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Druid Validator",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 22
+      },
+      "id": 65,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 7
+          },
+          "hiddenSeries": false,
+          "id": 63,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_content_cache_hit)",
+              "legendFormat": "ContentCacheHit",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_content_cache_miss)",
+              "legendFormat": "ContentCacheMiss",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_content_total)",
+              "legendFormat": "ContentTotal",
+              "refId": "C"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_device_cache_hit)",
+              "legendFormat": "DeviceCacheHit",
+              "refId": "D"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_device_cache_miss)",
+              "legendFormat": "DeviceCacheMiss",
+              "refId": "E"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_device_total)",
+              "legendFormat": "DeviceTotal",
+              "refId": "F"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_dialcode_cache_hit)",
+              "legendFormat": "DialcodeCacheHit",
+              "refId": "G"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_dialcode_cache_miss)",
+              "legendFormat": "DialcodeCacheMiss",
+              "refId": "H"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_dialcode_total)",
+              "legendFormat": "DialcodeCacheMiss",
+              "refId": "I"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_user_cache_hit)",
+              "legendFormat": "UserCacheMiss",
+              "refId": "J"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_events_expired)",
+              "legendFormat": "ExpiredEvent",
+              "refId": "K"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_unique_event_count)",
+              "legendFormat": "UniqueEventCount",
+              "refId": "L"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_user_cache_hit)",
+              "legendFormat": "UserCacheHit",
+              "refId": "N"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_user_cache_miss)",
+              "legendFormat": "UserCacheMiss",
+              "refId": "M"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_user_total)",
+              "legendFormat": "UserTotal",
+              "refId": "O"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "SummaryDenorm ",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 7
+          },
+          "hiddenSeries": false,
+          "id": 66,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max{ job = \"summary-denormalization-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "SummaryDenorm lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:229",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:230",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "SummaryDenorm",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 23
+      },
+      "id": 71,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 18
+          },
+          "hiddenSeries": false,
+          "id": 69,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_UserCacheUpdaterJobV2_success_message_count)",
+              "interval": "",
+              "legendFormat": "User-Cache-Updater-Success",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "User-Cache-Updater-v2",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 18
+          },
+          "hiddenSeries": false,
+          "id": 72,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"user-cache-updater-v2-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "User-Cache-Updater-lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "User-Cache-Updater-v2 lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "UserCacheUpdaterV2",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 24
+      },
+      "id": 129,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 10
+          },
+          "hiddenSeries": false,
+          "id": 130,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DeviceProfileUpdaterJob_success_event_count)",
+              "format": "time_series",
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "Success",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DeviceProfileUpdaterJob_device_db_update_count)",
+              "interval": "",
+              "legendFormat": "DbUpdate",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DeviceProfileUpdaterJob_failed_event_count)",
+              "interval": "",
+              "legendFormat": "Failed",
+              "refId": "C"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DeviceProfileUpdaterJob_device_cache_update_count)",
+              "interval": "",
+              "legendFormat": "CacheUpdate",
+              "refId": "D"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DeviceProfileUpdater",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:162",
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:163",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 10
+          },
+          "hiddenSeries": false,
+          "id": 131,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"device-profile-updater-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DeviceProfileUpdater lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:378",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:379",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "DeviceProfileUpdater",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 25
+      },
+      "id": 133,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 11
+          },
+          "hiddenSeries": false,
+          "id": 134,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_ContentCacheUpdaterJob_cache_hit_count)",
+              "format": "time_series",
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "Cache Hit",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_ContentCacheUpdaterJob_dial_codes_api_hit_count)",
+              "interval": "",
+              "legendFormat": "DialCode Api Hit",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_ContentCacheUpdaterJob_dial_codes_api_miss_count)",
+              "interval": "",
+              "legendFormat": "DialCode Api Miss",
+              "refId": "C"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_ContentCacheUpdaterJob_dial_codes_cache_hit_count)",
+              "interval": "",
+              "legendFormat": "DialCode Cache Hit",
+              "refId": "D"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_ContentCacheUpdaterJob_total_dial_code_count)",
+              "interval": "",
+              "legendFormat": "Total DialCode",
+              "refId": "E"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "ContentCacheUpdater",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:162",
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:163",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 11
+          },
+          "hiddenSeries": false,
+          "id": 135,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"content-cache-updater-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "ContentCacheUpdater lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:378",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:379",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "ContentCacheUpdater",
+      "type": "row"
+    }
+  ],
+  "refresh": "30s",
+  "schemaVersion": 25,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now/d",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5m"
+    ]
+  },
+  "timezone": "",
+  "title": "Data Pipeline Metrics Flink",
+  "uid": "YngLt0kGz",
+  "version": 39
+}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/dp-flink-lag-dashboard.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/dp-flink-lag-dashboard.json
new file mode 100644
index 000000000..af732fbff
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/dp-flink-lag-dashboard.json
@@ -0,0 +1,12517 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 85,
+  "iteration": 1606284335462,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 20,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical:  2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 6
+          },
+          "id": 21,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.flink.kp.events\", endpoint=\"metrics\", instance=\"11.4.35.172:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-75f7894b77-5h8bw\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.raw\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=~\"ntpprod.flink.kp.events\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "logstash Raw events lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical:  2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 6
+          },
+          "id": 113,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry-log.indexer\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.error\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=~\"ntpprod.telemetry-log.indexer\", job=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.error\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "logstash Telemetry Error events lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical:  2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 6
+          },
+          "id": 114,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry-log.indexer\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.log\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=~\"ntpprod.telemetry-log.indexer\", job=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.log\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "logstash Telemetry log events lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Logstash Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 1
+      },
+      "id": 15,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 6
+          },
+          "id": 16,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"assessment-aggregator-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AssessmentAggregator Lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical:  2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 6
+          },
+          "id": 17,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"activity-aggregate-updater-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ActivityAggUpdater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 6
+          },
+          "id": 18,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"relation-cache-updater-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "RelationCache Updater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 6
+          },
+          "id": 111,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"post-publish-processor-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "PostPublishProcessor lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "KP Flink Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 2
+      },
+      "id": 41,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 3
+          },
+          "id": 42,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-assessment-aggregator-group\", endpoint=\"metrics\", instance=\"11.4.35.172:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-75f7894b77-5h8bw\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.assess\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-assessment-aggregator-group\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AssessmentAggregator Lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical:  2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 3
+          },
+          "id": 43,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-activity-aggregate-group\", endpoint=\"metrics\", instance=\"11.4.35.172:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-75f7894b77-5h8bw\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.coursebatch.job.request\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-activity-aggregate-group\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ActivityAggUpdater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 3
+          },
+          "id": 44,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-relation-cache-updater-group\", endpoint=\"metrics\", instance=\"11.4.35.172:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-75f7894b77-5h8bw\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.content.postpublish.request\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-relation-cache-updater-group\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "RelationCache Updater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 3
+          },
+          "id": 112,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-post-publish-processor-group\", endpoint=\"metrics\", instance=\"11.4.35.172:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-75f7894b77-5h8bw\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.content.postpublish.request\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-post-publish-processor-group\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "PostPublishProcessor Lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "KP Flink Consumer Group Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 80,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50k\nCritical: 100k",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 8
+          },
+          "id": 81,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'course-batch-updater' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CourseBatchUpdater",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 8
+          },
+          "id": 82,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'course-certificate-generator' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CourseCertificateGenerator",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50K\nCritical: 100K",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 8
+          },
+          "id": 83,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'publish-pipeline' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "PublishPipeline",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50K\nCritical: 100K",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 8
+          },
+          "id": 84,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'composite-search-indexer') AND $timeFilter GROUP BY time($__interval) fill(null)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CompositeSearchIndexer",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50K\nCritical: 100k",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 8
+          },
+          "id": 85,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'audit-history-indexer' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AuditHistoryIndexer",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50K\nCritical: 100K",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 8
+          },
+          "id": 86,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'audit-history-indexer' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AuditHistoryIndexer",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold:\nWarning: 50K\nCritical: 100K",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 12
+          },
+          "id": 87,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'audit-event-generator' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AuditEventGenerator",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50K\nCritical: 100K",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 12
+          },
+          "id": 88,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'asset-enrichment' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AssetEnrichment",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "KP Samza Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 4
+      },
+      "id": 2,
+      "panels": [],
+      "title": "DP Flink Lag",
+      "type": "row"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "description": "Threshold:\nWarning: 5M\nCritical:  10M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 0,
+        "y": 5
+      },
+      "id": 4,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"ingest-router-taskmanager-prometheus\" })",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "5000000,10000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Ingestion Router lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "description": "Threshold:\nWarning: 5M\nCritical:  10M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 4,
+        "y": 5
+      },
+      "id": 5,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"telemetry-extractor-taskmanager-prometheus\" })",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "5000000,10000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "TelemetryExtractor lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 8,
+        "y": 5
+      },
+      "id": 6,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"pipeline-preprocessor-taskmanager-prometheus\" })",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Preprocessor lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 12,
+        "y": 5
+      },
+      "id": 8,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"druid-validator-taskmanager-prometheus\" })",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "DruidValidator lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 16,
+        "y": 5
+      },
+      "id": 89,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"de-normalization-primary-taskmanager-prometheus\" })",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "DenormalizationPrimary lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 20,
+        "y": 5
+      },
+      "id": 90,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"de-normalization-secondary-taskmanager-prometheus\" })",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "DenormalizationSecondarylag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 0,
+        "y": 9
+      },
+      "id": 10,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max{endpoint=\"prom\", host=\"device_profile_updater_taskmanager_b48455c9c_fndpv\", instance=\"11.4.9.108:9251\", job=\"device-profile-updater-taskmanager-prometheus\", job_id=\"f9b614d1d00f894bb46f6cd115f1ed89\", job_name=\"Device_profile_updater\", namespace=\"flink-production\", operator_id=\"9b2fa66376e7322a8972db73e0d4b7a7\", operator_name=\"Source:_device_profile_consumer\", pod=\"device-profile-updater-taskmanager-b48455c9c-fndpv\", service=\"device-profile-updater-taskmanager-prometheus\", subtask_index=\"0\", task_attempt_id=\"c653c74983d1666988deb2db9b1ce007\", task_attempt_num=\"0\", task_id=\"9b2fa66376e7322a8972db73e0d4b7a7\", task_name=\"Source:_device_profile_consumer\", tm_id=\"1bb922c4b253c06e73a5650b25ae0170\"}",
+      "targets": [
+        {
+          "expr": "(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"device-profile-updater-taskmanager-prometheus\" })",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Device-Profile-Updater lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 4,
+        "y": 9
+      },
+      "id": 11,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"content-cache-updater-taskmanager-prometheus\" })",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Content-Cache-Updater lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 8,
+        "y": 9
+      },
+      "id": 13,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"user-cache-updater-v2-taskmanager-prometheus\" })",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "UserCacheUpdaterV2 lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 12,
+        "y": 9
+      },
+      "id": 9,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max{ job = \"summary-denormalization-taskmanager-prometheus\" })",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "SummaryDenorm lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 13
+      },
+      "id": 46,
+      "panels": [],
+      "title": "DP Flink Consumer Group Lag",
+      "type": "row"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "description": "Threshold:\nWarning: 5M\nCritical:  10M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 0,
+        "y": 14
+      },
+      "id": 47,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "{consumergroup=\"ntpprod-ingest-router-group\", endpoint=\"metrics\", instance=\"11.4.35.220:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-666bdff69c-4rqdd\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.ingestion\"}",
+      "targets": [
+        {
+          "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-ingest-router-group\", job=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.ingestion\"})",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "5000000,10000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Ingestion Router lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "description": "Threshold:\nWarning: 5M\nCritical:  10M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 4,
+        "y": 14
+      },
+      "id": 48,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "{consumergroup=\"ntpprod-telemetry-extractor-group\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.ingest\"}",
+      "targets": [
+        {
+          "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-telemetry-extractor-group\", job=\"processing-kafka-exporter\"})",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "5000000,10000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Telemetry Extractor lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 8,
+        "y": 14
+      },
+      "id": 49,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "{consumergroup=\"ntpprod-pipeline-preprocessor-group\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.raw\"}",
+      "targets": [
+        {
+          "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-pipeline-preprocessor-group\", job=\"processing-kafka-exporter\"})",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "PreProcessor lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 12,
+        "y": 14
+      },
+      "id": 51,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "{consumergroup=\"ntpprod-druid-validator-group\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.denorm\"}",
+      "targets": [
+        {
+          "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-druid-validator-group\", job=\"processing-kafka-exporter\"})",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "DruidValidator lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 16,
+        "y": 14
+      },
+      "id": 55,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "{consumergroup=\"ntpprod-telemetry-denorm-primary-group\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.unique.primary\"}",
+      "targets": [
+        {
+          "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-telemetry-denorm-primary-group\", job=\"processing-kafka-exporter\"})",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "DenormalizationPrimary lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 20,
+        "y": 14
+      },
+      "id": 91,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "{consumergroup=\"ntpprod-telemetry-denorm-secondary-group\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.unique.secondary\"}",
+      "targets": [
+        {
+          "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-telemetry-denorm-secondary-group\", job=\"processing-kafka-exporter\"})",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "DenormalizationSecondary lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 0,
+        "y": 18
+      },
+      "id": 53,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "{consumergroup=\"ntpprod-device-profile-updater-group\", endpoint=\"metrics\", instance=\"11.4.35.220:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-666bdff69c-4rqdd\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.events.deviceprofile\"}",
+      "targets": [
+        {
+          "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-device-profile-updater-group\", job=\"ingestion-kafka-exporter\"})",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "DeviceProfileUpdater lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 4,
+        "y": 18
+      },
+      "id": 54,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "{consumergroup=\"ntpprod-content-cache-updater-group\", endpoint=\"metrics\", instance=\"11.4.35.220:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-666bdff69c-4rqdd\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.learning.graph.events\"}",
+      "targets": [
+        {
+          "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-content-cache-updater-group\", job=\"ingestion-kafka-exporter\"})",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "ContentCacheUpdater lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 8,
+        "y": 18
+      },
+      "id": 92,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "{consumergroup=\"ntpprod-user-cache-updater-consumer-group\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.audit\"}",
+      "targets": [
+        {
+          "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-user-cache-updater-consumer-group\", job=\"processing-kafka-exporter\"})",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "UserCacheUpdaterV2 lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 12,
+        "y": 18
+      },
+      "id": 52,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "{consumergroup=\"ntpprod-summmary-denorm-group\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.derived\"}",
+      "targets": [
+        {
+          "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-summmary-denorm-group\", job=\"processing-kafka-exporter\"})",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "10000000,15000000",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "SummaryDenorm lag",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 22
+      },
+      "id": 23,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 7
+          },
+          "id": 24,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.ingestion.events.backup\", endpoint=\"metrics\", instance=\"11.4.35.220:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-666bdff69c-4rqdd\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.ingestion\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.ingestion.events.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "IngestionTelemetryBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 7
+          },
+          "id": 28,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.raw.events.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.raw\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.raw.events.backup\", job=\"processing-kafka-exporter\"}) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "RawTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 7
+          },
+          "id": 26,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.failed.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.failed\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.failed.backup\", job=\"processing-kafka-exporter\"}) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "FailedTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 7
+          },
+          "id": 27,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.extractor.duplicate.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.extractor.duplicate\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.extractor.duplicate.backup\", job=\"processing-kafka-exporter\"}) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ExtractorDuplicateEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 7
+          },
+          "id": 34,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.channel.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.denorm\"}",
+          "targets": [
+            {
+              "expr": "sum without (partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.channel.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ChannelTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 7
+          },
+          "id": 30,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.derived.unique.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.derived.unique\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.derived.unique.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DerivedUniqueTelemetryBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 11
+          },
+          "id": 29,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.assess.raw\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.assess.raw\"}",
+          "targets": [
+            {
+              "expr": "sum without (partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.assess.raw\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AssesRawEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 11
+          },
+          "id": 25,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.extractor.failed.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.extractor.failed\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.extractor.failed.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ExtractorFailedEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 11
+          },
+          "id": 32,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.unique.events.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.unique\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.unique.events.backup\", job=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.unique\"}) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "UniqueTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 11
+          },
+          "id": 33,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.summary.channel.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.summary\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.summary.channel.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ChannelEventsSummaryBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshod: \nWarning: 50K\nCritical: 1L",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 11
+          },
+          "id": 56,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.failed.learning.events.backup\", endpoint=\"metrics\", instance=\"11.4.35.220:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-666bdff69c-4rqdd\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.learning.events.failed\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.failed.learning.events.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "LearningFailedEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 11
+          },
+          "id": 35,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.denorm.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.denorm\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.denorm.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DenormTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 15
+          },
+          "id": 36,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.events.device.profile.backup\", endpoint=\"metrics\", instance=\"11.4.35.220:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-666bdff69c-4rqdd\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.events.deviceprofile\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.events.device.profile.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DeviceProfileEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 15
+          },
+          "id": 31,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.duplicate.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.duplicate\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.duplicate.backup\", job=\"processing-kafka-exporter\"}) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DuplicateTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 15
+          },
+          "id": 38,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.assess.events.backup\", endpoint=\"metrics\", instance=\"11.4.35.220:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-666bdff69c-4rqdd\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.assess\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.assess.events.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AssessTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 15
+          },
+          "id": 39,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.summary.backup\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.summary\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.summary.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DerivedDenormEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 1.5M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 15
+          },
+          "id": 37,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.learning.graph.events.backup\", endpoint=\"metrics\", instance=\"11.4.35.220:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-666bdff69c-4rqdd\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.learning.graph.events\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.learning.graph.events.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,1500000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "LearningGraphEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 4M\nCritical: 8M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 15
+          },
+          "id": 57,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.coursebatch.job.request.backup\", endpoint=\"metrics\", instance=\"11.4.35.220:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-666bdff69c-4rqdd\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.coursebatch.job.request\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.coursebatch.job.request.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "4000000,8000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CourceBatchEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Secor Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 23
+      },
+      "id": 59,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 24,
+            "x": 0,
+            "y": 12
+          },
+          "hiddenSeries": false,
+          "id": 61,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": false,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(dataproduct_workflowsummarymodel_time_taken_secs)",
+              "interval": "",
+              "legendFormat": "time_taken: {{ subsystem }}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Totatl Data Products time taken",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:404",
+              "format": "s",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "$$hashKey": "object:405",
+              "format": "s",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "datasource": null,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {
+                "align": "left"
+              },
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 0,
+                  "operator": "",
+                  "text": "",
+                  "to": "",
+                  "type": 1,
+                  "value": ""
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "short"
+            },
+            "overrides": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Value #A"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Total"
+                  }
+                ]
+              },
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Value #B"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Total"
+                  }
+                ]
+              }
+            ]
+          },
+          "gridPos": {
+            "h": 5,
+            "w": 11,
+            "x": 0,
+            "y": 20
+          },
+          "id": 63,
+          "options": {
+            "frameIndex": 0,
+            "showHeader": true,
+            "sortBy": [
+              {
+                "desc": true,
+                "displayName": "report_date"
+              }
+            ]
+          },
+          "pluginVersion": "7.0.6",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(dataproduct_workflowsummarymodel_input_events[${__range_s}s])) by (report_date)",
+              "format": "table",
+              "hide": false,
+              "instant": true,
+              "interval": "",
+              "legendFormat": "input_events",
+              "refId": "A"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Total Data Products Input count",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Time": true,
+                  "endpoint": true,
+                  "instance": true,
+                  "namespace": true,
+                  "service": true,
+                  "status": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            }
+          ],
+          "type": "table"
+        },
+        {
+          "datasource": null,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {
+                "align": "left"
+              },
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 0,
+                  "operator": "",
+                  "text": "",
+                  "to": "",
+                  "type": 1,
+                  "value": ""
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "short"
+            },
+            "overrides": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Value #A"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Total"
+                  }
+                ]
+              },
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Value #B"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Total"
+                  }
+                ]
+              }
+            ]
+          },
+          "gridPos": {
+            "h": 5,
+            "w": 13,
+            "x": 11,
+            "y": 20
+          },
+          "id": 65,
+          "options": {
+            "frameIndex": 0,
+            "showHeader": true,
+            "sortBy": [
+              {
+                "desc": true,
+                "displayName": "report_date"
+              }
+            ]
+          },
+          "pluginVersion": "7.0.6",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(dataproduct_workflowsummarymodel_output_events[${__range_s}s])) by (report_date)",
+              "format": "table",
+              "hide": false,
+              "instant": true,
+              "interval": "",
+              "legendFormat": "input_events",
+              "refId": "A"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Total Data Products Output count",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Time": true,
+                  "endpoint": true,
+                  "instance": true,
+                  "namespace": true,
+                  "service": true,
+                  "status": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            }
+          ],
+          "type": "table"
+        }
+      ],
+      "title": "WFS Metrics",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 24
+      },
+      "id": 73,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  audit-rollup-syncts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 9
+          },
+          "id": 74,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"rollup\", exported_job=\"audit-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"rollup\",exported_job=\"audit-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AuditRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  error-rollup-syncts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 9
+          },
+          "id": 75,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"rollup\", exported_job=\"error-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"rollup\",exported_job=\"error-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ErrorRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  summary-distinct-counts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 9
+          },
+          "id": 76,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"rollup\", exported_job=\"summary-distinct-counts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"rollup\",exported_job=\"summary-distinct-counts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryDistinctCounts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  summary-rollup-syncts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 9
+          },
+          "id": 77,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"rollup\", exported_job=\"summary-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"rollup\",exported_job=\"summary-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  summary-rollup-syncts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 9
+          },
+          "id": 78,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"rollup\", exported_job=\"telemetry-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"rollup\",exported_job=\"telemetry-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Druid Rollup Cluster DataSource Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 25
+      },
+      "id": 67,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "DataSource name: summary-events",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 10
+          },
+          "id": 69,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"raw\", exported_job=\"summary-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"raw\",exported_job=\"summary-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Summary-Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name: telemetry-events-syncts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 10
+          },
+          "id": 70,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"raw\", exported_job=\"telemetry-events-syncts\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"raw\",exported_job=\"telemetry-events-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryEventsSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  telemetry-feedback-events",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 10
+          },
+          "id": 71,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"raw\", exported_job=\"telemetry-feedback-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"raw\",exported_job=\"telemetry-feedback-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryFeedbackEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Druid Raw Cluster DataSource Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 26
+      },
+      "id": 94,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 23
+          },
+          "id": 95,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"audit-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"audit-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AuditRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 23
+          },
+          "id": 96,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"error-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"error-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ErrorRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 23
+          },
+          "id": 97,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"summary-distinct-counts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"summary-distinct-counts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryDistinctCounts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 23
+          },
+          "id": 98,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"summary-monthly-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"summary-monthly-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryMonthlyRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 23
+          },
+          "id": 99,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"summary-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"summary-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 23
+          },
+          "id": 100,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"telemetry-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"telemetry-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Druid Rolllup Cluster Segment Unavailable Count",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 27
+      },
+      "id": 102,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 16
+          },
+          "id": 103,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"content-model-snapshot\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"content-model-snapshot\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ContentModelSnapshot",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 16
+          },
+          "id": 104,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"offline-desktop-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"offline-desktop-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "OfflineDesktopEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 16
+          },
+          "id": 105,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"pipeline-metrics\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"pipeline-metrics\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "PipelineMetrics",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 16
+          },
+          "id": 106,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"summary-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"summary-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 16
+          },
+          "id": 107,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"telemetry-error-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"telemetry-error-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryErrorEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 16
+          },
+          "id": 108,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"telemetry-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"telemetry-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 20
+          },
+          "id": 109,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"telemetry-events-syncts\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"telemetry-events-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryEventsSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 20
+          },
+          "id": 110,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"telemetry-feedback-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"telemetry-feedback-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryFeedbackEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Druid Raw Cluster Segment Unavailable Count",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 28
+      },
+      "id": 116,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 13
+          },
+          "id": 117,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"derived-telemetry-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"derived-telemetry-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "derived-telemetry-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 13
+          },
+          "id": 123,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"derived-denorm-events-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"derived-denorm-events-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "derived-denorm-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 13
+          },
+          "id": 119,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"channel-summary-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"channel-summary-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-summary-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 13
+          },
+          "id": 120,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"assess-events-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"assess-events-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "assess-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 13
+          },
+          "id": 121,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"assess-raw-events-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"assess-raw-events-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "assess-raw-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 20,
+            "y": 13
+          },
+          "id": 122,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"device-profile-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"device-profile-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "device-profile-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 16
+          },
+          "id": 118,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"learning-events-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"learning-events-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "learning-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 16
+          },
+          "id": 124,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"learning-failed-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"learning-failed-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "learning-failed-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 16
+          },
+          "id": 125,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"content-consumption-events-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"content-consumption-events-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "content-consumption-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 16
+          },
+          "id": 126,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"failed-telemetry-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"failed-telemetry-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "failed-telemetry-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 16
+          },
+          "id": 127,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"extractor-duplicate-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"extractor-duplicate-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "extractor-duplicate-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 20,
+            "y": 16
+          },
+          "id": 128,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"extractor-failed-backup\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"extractor-failed-backup\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "extractor-failed-backup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 19
+          },
+          "id": 129,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"channel-telemetry-backup-1\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"channel-telemetry-backup-1\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-telemetry-backup-1",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 19
+          },
+          "id": 130,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"channel-telemetry-backup-2\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"channel-telemetry-backup-2\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-telemetry-backup-2",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 19
+          },
+          "id": 131,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"channel-telemetry-backup-3\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"channel-telemetry-backup-3\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-telemetry-backup-3",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 19
+          },
+          "id": 132,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"channel-telemetry-backup-4\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"channel-telemetry-backup-4\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-telemetry-backup-4",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 19
+          },
+          "id": 133,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"channel-telemetry-backup-5\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"channel-telemetry-backup-5\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-telemetry-backup-5",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 20,
+            "y": 19
+          },
+          "id": 134,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"channel-telemetry-backup-6\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"channel-telemetry-backup-6\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-telemetry-backup-6",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 22
+          },
+          "id": 135,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"channel-telemetry-backup-7\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"channel-telemetry-backup-7\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-telemetry-backup-7",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 22
+          },
+          "id": 136,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"channel-telemetry-backup-8\", instance=\"11.4.3.67:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"channel-telemetry-backup-8\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-telemetry-backup-8",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 22
+          },
+          "id": 137,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"ingestion-telemetry-backup-1\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"ingestion-telemetry-backup-1\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ingestion-telemetry-backup-1",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 22
+          },
+          "id": 138,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"ingestion-telemetry-backup-2\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"ingestion-telemetry-backup-2\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ingestion-telemetry-backup-2",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 22
+          },
+          "id": 139,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"ingestion-telemetry-backup-3\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"ingestion-telemetry-backup-3\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ingestion-telemetry-backup-3",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 20,
+            "y": 22
+          },
+          "id": 140,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"ingestion-telemetry-backup-4\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"ingestion-telemetry-backup-4\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ingestion-telemetry-backup-4",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 25
+          },
+          "id": 141,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"raw-telemetry-backup-1\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"raw-telemetry-backup-1\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "raw-telemetry-backup-1",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 25
+          },
+          "id": 142,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"raw-telemetry-backup-2\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"raw-telemetry-backup-2\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "raw-telemetry-backup-2",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 25
+          },
+          "id": 143,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"raw-telemetry-backup-3\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"raw-telemetry-backup-3\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "raw-telemetry-backup-3",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 25
+          },
+          "id": 144,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"raw-telemetry-backup-4\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"raw-telemetry-backup-4\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "raw-telemetry-backup-4",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 25
+          },
+          "id": 145,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"raw-telemetry-backup-5\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"raw-telemetry-backup-5\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "raw-telemetry-backup-5",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 20,
+            "y": 25
+          },
+          "id": 146,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"raw-telemetry-backup-6\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"raw-telemetry-backup-6\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "raw-telemetry-backup-6",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 28
+          },
+          "id": 147,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"raw-telemetry-backup-7\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"raw-telemetry-backup-7\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "raw-telemetry-backup-7",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 28
+          },
+          "id": 148,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"raw-telemetry-backup-8\", instance=\"11.4.3.66:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"raw-telemetry-backup-8\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "raw-telemetry-backup-8",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 28
+          },
+          "id": 149,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"denorm-events-backup-1\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"denorm-events-backup-1\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "denorm-events-backup-1",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 28
+          },
+          "id": 150,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"denorm-events-backup-2\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"denorm-events-backup-2\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "denorm-events-backup-2",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 28
+          },
+          "id": 151,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"denorm-events-backup-3\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"denorm-events-backup-3\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "denorm-events-backup-3",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 20,
+            "y": 28
+          },
+          "id": 152,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"denorm-events-backup-4\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"denorm-events-backup-4\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "denorm-events-backup-4",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 31
+          },
+          "id": 153,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"denorm-events-backup-5\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"denorm-events-backup-5\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "denorm-events-backup-5",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 31
+          },
+          "id": 154,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"denorm-events-backup-6\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"denorm-events-backup-6\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "denorm-events-backup-6",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 31
+          },
+          "id": 155,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"denorm-events-backup-7\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"denorm-events-backup-7\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "denorm-events-backup-7",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 31
+          },
+          "id": 156,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"denorm-events-backup-8\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"denorm-events-backup-8\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "denorm-events-backup-8",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 31
+          },
+          "id": 157,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"unique-telemetry-backup-1\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"unique-telemetry-backup-1\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "unique-telemetry-backup-1",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 20,
+            "y": 31
+          },
+          "id": 158,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"unique-telemetry-backup-2\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"unique-telemetry-backup-2\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "unique-telemetry-backup-2",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 34
+          },
+          "id": 159,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"unique-telemetry-backup-3\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"unique-telemetry-backup-3\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "unique-telemetry-backup-3",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 34
+          },
+          "id": 160,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"unique-telemetry-backup-4\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"unique-telemetry-backup-4\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "unique-telemetry-backup-4",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 34
+          },
+          "id": 161,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"unique-telemetry-backup-5\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"unique-telemetry-backup-5\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "unique-telemetry-backup-5",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 34
+          },
+          "id": 162,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"unique-telemetry-backup-6\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"unique-telemetry-backup-6\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "unique-telemetry-backup-6",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 34
+          },
+          "id": 163,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"unique-telemetry-backup-7\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"unique-telemetry-backup-7\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "unique-telemetry-backup-7",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nProcess Running: 1\nNot Running: 0",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 20,
+            "y": 34
+          },
+          "id": 164,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{groupname=\"unique-telemetry-backup-8\", instance=\"11.4.3.65:1111\", job=\"process-exporter\"}",
+          "targets": [
+            {
+              "expr": "sum without(state) (namedprocess_namegroup_states{groupname=\"unique-telemetry-backup-8\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "unique-telemetry-backup-8",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Secor Process",
+      "type": "row"
+    }
+  ],
+  "refresh": false,
+  "schemaVersion": 25,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "ntpprod",
+          "value": "ntpprod"
+        },
+        "hide": 2,
+        "label": "",
+        "name": "env",
+        "options": [
+          {
+            "selected": true,
+            "text": "ntpprod",
+            "value": "ntpprod"
+          }
+        ],
+        "query": "ntpprod",
+        "skipUrlSync": false,
+        "type": "constant"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ]
+  },
+  "timezone": "",
+  "title": "Lag Dashboard",
+  "uid": "vfdQRdtMz",
+  "version": 121
+}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/kp-flink-jobs-metrics-dashboard.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/kp-flink-jobs-metrics-dashboard.json
index ea245a4b3..9ccb60dc4 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/dashboards/kp-flink-jobs-metrics-dashboard.json
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/kp-flink-jobs-metrics-dashboard.json
@@ -15,7 +15,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 65,
+  "id": 109,
   "links": [],
   "panels": [
     {
@@ -101,6 +101,100 @@
         "ymin": null
       },
       "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_total_events_count[$__range]))",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Total Events",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "$$hashKey": "object:2196",
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 8,
+        "x": 8,
+        "y": 1
+      },
+      "id": 70,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "$$hashKey": "object:2193",
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "$$hashKey": "object:2194",
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
       "targets": [
         {
           "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_batch_enrolment_update_count[$__range]))",
@@ -126,6 +220,100 @@
       ],
       "valueName": "current"
     },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#73BF69",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 8,
+        "x": 16,
+        "y": 1
+      },
+      "id": 71,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "$$hashKey": "object:2193",
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "$$hashKey": "object:2194",
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_processed_enrolment_count[$__range]))",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Processed Enrolment Count",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "$$hashKey": "object:2196",
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
     {
       "cacheTimeout": null,
       "colorBackground": false,
@@ -153,8 +341,8 @@
       "gridPos": {
         "h": 4,
         "w": 8,
-        "x": 8,
-        "y": 1
+        "x": 0,
+        "y": 5
       },
       "id": 6,
       "interval": null,
@@ -247,8 +435,8 @@
       "gridPos": {
         "h": 4,
         "w": 8,
-        "x": 16,
-        "y": 1
+        "x": 8,
+        "y": 5
       },
       "id": 62,
       "interval": null,
@@ -319,9 +507,9 @@
       "colorBackground": false,
       "colorValue": true,
       "colors": [
-        "#299c46",
+        "#F2495C",
         "rgba(237, 129, 40, 0.89)",
-        "#E02F44"
+        "#299c46"
       ],
       "datasource": "Flink-Prometheus",
       "fieldConfig": {
@@ -339,21 +527,23 @@
         "thresholdMarkers": true
       },
       "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 0,
+        "h": 4,
+        "w": 8,
+        "x": 16,
         "y": 5
       },
-      "id": 59,
+      "id": 63,
       "interval": null,
       "links": [],
       "mappingType": 1,
       "mappingTypes": [
         {
+          "$$hashKey": "object:1401",
           "name": "value to text",
           "value": 1
         },
         {
+          "$$hashKey": "object:1402",
           "name": "range to text",
           "value": 2
         }
@@ -383,7 +573,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_db_update_count[$__range]))",
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_cache_miss_count[$__range]))",
           "instant": true,
           "interval": "",
           "legendFormat": "",
@@ -393,11 +583,12 @@
       "thresholds": "",
       "timeFrom": null,
       "timeShift": null,
-      "title": "DB Update",
+      "title": "Cache Miss",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
         {
+          "$$hashKey": "object:1404",
           "op": "=",
           "text": "N/A",
           "value": "null"
@@ -430,23 +621,21 @@
         "thresholdMarkers": true
       },
       "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 6,
-        "y": 5
+        "h": 4,
+        "w": 8,
+        "x": 0,
+        "y": 9
       },
-      "id": 64,
+      "id": 59,
       "interval": null,
       "links": [],
       "mappingType": 1,
       "mappingTypes": [
         {
-          "$$hashKey": "object:2152",
           "name": "value to text",
           "value": 1
         },
         {
-          "$$hashKey": "object:2153",
           "name": "range to text",
           "value": 2
         }
@@ -476,7 +665,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_db_read_count[$__range]))",
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_db_update_count[$__range]))",
           "instant": true,
           "interval": "",
           "legendFormat": "",
@@ -486,12 +675,11 @@
       "thresholds": "",
       "timeFrom": null,
       "timeShift": null,
-      "title": "DB Read",
+      "title": "DB Update",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
         {
-          "$$hashKey": "object:2155",
           "op": "=",
           "text": "N/A",
           "value": "null"
@@ -504,9 +692,9 @@
       "colorBackground": false,
       "colorValue": true,
       "colors": [
-        "#73BF69",
+        "#299c46",
         "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
+        "#E02F44"
       ],
       "datasource": "Flink-Prometheus",
       "fieldConfig": {
@@ -524,23 +712,23 @@
         "thresholdMarkers": true
       },
       "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 12,
-        "y": 5
+        "h": 4,
+        "w": 8,
+        "x": 8,
+        "y": 9
       },
-      "id": 5,
+      "id": 64,
       "interval": null,
       "links": [],
       "mappingType": 1,
       "mappingTypes": [
         {
-          "$$hashKey": "object:1360",
+          "$$hashKey": "object:2152",
           "name": "value to text",
           "value": 1
         },
         {
-          "$$hashKey": "object:1361",
+          "$$hashKey": "object:2153",
           "name": "range to text",
           "value": 2
         }
@@ -570,7 +758,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_cache_hit_count[$__range]))",
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_db_read_count[$__range]))",
           "instant": true,
           "interval": "",
           "legendFormat": "",
@@ -580,12 +768,12 @@
       "thresholds": "",
       "timeFrom": null,
       "timeShift": null,
-      "title": "Cache Hit",
+      "title": "DB Read",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
         {
-          "$$hashKey": "object:1363",
+          "$$hashKey": "object:2155",
           "op": "=",
           "text": "N/A",
           "value": "null"
@@ -598,9 +786,9 @@
       "colorBackground": false,
       "colorValue": true,
       "colors": [
-        "#F2495C",
+        "#73BF69",
         "rgba(237, 129, 40, 0.89)",
-        "#299c46"
+        "#d44a3a"
       ],
       "datasource": "Flink-Prometheus",
       "fieldConfig": {
@@ -618,23 +806,23 @@
         "thresholdMarkers": true
       },
       "gridPos": {
-        "h": 3,
-        "w": 6,
-        "x": 18,
-        "y": 5
+        "h": 4,
+        "w": 8,
+        "x": 16,
+        "y": 9
       },
-      "id": 63,
+      "id": 5,
       "interval": null,
       "links": [],
       "mappingType": 1,
       "mappingTypes": [
         {
-          "$$hashKey": "object:1401",
+          "$$hashKey": "object:1360",
           "name": "value to text",
           "value": 1
         },
         {
-          "$$hashKey": "object:1402",
+          "$$hashKey": "object:1361",
           "name": "range to text",
           "value": 2
         }
@@ -664,7 +852,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_cache_miss_count[$__range]))",
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_cache_hit_count[$__range]))",
           "instant": true,
           "interval": "",
           "legendFormat": "",
@@ -674,12 +862,12 @@
       "thresholds": "",
       "timeFrom": null,
       "timeShift": null,
-      "title": "Cache Miss",
+      "title": "Cache Hit",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
         {
-          "$$hashKey": "object:1404",
+          "$$hashKey": "object:1363",
           "op": "=",
           "text": "N/A",
           "value": "null"
@@ -691,8 +879,9 @@
       "aliasColors": {
         "ActivityAggregateFailed": "red",
         "BatchEnolmentUpdate": "green",
-        "Cache Miss": "yellow",
-        "DB Update": "rgb(48, 243, 255)"
+        "Cache Miss": "dark-orange",
+        "DB Update": "rgb(48, 243, 255)",
+        "Total Events": "dark-purple"
       },
       "bars": false,
       "dashLength": 10,
@@ -710,13 +899,13 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 8
+        "y": 13
       },
       "hiddenSeries": false,
       "id": 10,
       "legend": {
         "avg": false,
-        "current": false,
+        "current": true,
         "max": false,
         "min": false,
         "show": true,
@@ -735,6 +924,7 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
+          "$$hashKey": "object:249",
           "alias": "ActivityAggregateFailed",
           "yaxis": 1
         }
@@ -766,6 +956,18 @@
           "interval": "",
           "legendFormat": "Cache Miss",
           "refId": "D"
+        },
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_activity_aggregate_updater_total_events_count)",
+          "interval": "",
+          "legendFormat": "Total Events",
+          "refId": "E"
+        },
+        {
+          "expr": "sum(flink_taskmanager_job_task_operator_activity_aggregate_updater_processed_enrolment_count)",
+          "interval": "",
+          "legendFormat": "Processed Enrolments",
+          "refId": "F"
         }
       ],
       "thresholds": [],
@@ -829,19 +1031,19 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 8
+        "y": 13
       },
       "hiddenSeries": false,
       "id": 12,
       "legend": {
         "alignAsTable": false,
-        "avg": true,
+        "avg": false,
         "current": true,
-        "max": true,
-        "min": true,
+        "max": false,
+        "min": false,
         "rightSide": false,
         "show": true,
-        "total": true,
+        "total": false,
         "values": true
       },
       "lines": true,
@@ -860,7 +1062,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"activity-aggregate-updater-taskmanager-prometheus\" })",
+          "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"activity-aggregate-updater-taskmanager-prometheus\"})",
           "interval": "",
           "legendFormat": "Consumer lag",
           "refId": "A"
@@ -914,7 +1116,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 16
+        "y": 21
       },
       "id": 14,
       "panels": [],
@@ -949,7 +1151,7 @@
         "h": 4,
         "w": 4,
         "x": 0,
-        "y": 17
+        "y": 22
       },
       "id": 21,
       "interval": null,
@@ -1043,7 +1245,7 @@
         "h": 4,
         "w": 4,
         "x": 4,
-        "y": 17
+        "y": 22
       },
       "id": 61,
       "interval": null,
@@ -1137,7 +1339,7 @@
         "h": 4,
         "w": 4,
         "x": 8,
-        "y": 17
+        "y": 22
       },
       "id": 22,
       "interval": null,
@@ -1231,7 +1433,7 @@
         "h": 4,
         "w": 4,
         "x": 12,
-        "y": 17
+        "y": 22
       },
       "id": 60,
       "interval": null,
@@ -1326,7 +1528,7 @@
         "h": 4,
         "w": 4,
         "x": 16,
-        "y": 17
+        "y": 22
       },
       "id": 65,
       "interval": null,
@@ -1421,7 +1623,7 @@
         "h": 4,
         "w": 4,
         "x": 20,
-        "y": 17
+        "y": 22
       },
       "id": 69,
       "interval": null,
@@ -1510,13 +1712,13 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 21
+        "y": 26
       },
       "hiddenSeries": false,
       "id": 25,
       "legend": {
         "avg": false,
-        "current": false,
+        "current": true,
         "max": false,
         "min": false,
         "show": true,
@@ -1623,17 +1825,17 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 21
+        "y": 26
       },
       "hiddenSeries": false,
       "id": 29,
       "legend": {
-        "avg": true,
+        "avg": false,
         "current": true,
-        "max": true,
-        "min": true,
+        "max": false,
+        "min": false,
         "show": true,
-        "total": true,
+        "total": false,
         "values": true
       },
       "lines": true,
@@ -1713,7 +1915,7 @@
     "list": []
   },
   "time": {
-    "from": "now-5m",
+    "from": "now-7d",
     "to": "now"
   },
   "timepicker": {
@@ -1723,6 +1925,6 @@
   },
   "timezone": "",
   "title": "KP Flink Jobs Metrics",
-  "uid": "YngLt0kGz",
-  "version": 20
+  "uid": "YngLt0kG1",
+  "version": 21
 }
\ No newline at end of file
diff --git a/kubernetes/helm_charts/monitoring/dashboards/values.yaml b/kubernetes/helm_charts/monitoring/dashboards/values.yaml
index 130365b53..ea60dd75d 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/values.yaml
+++ b/kubernetes/helm_charts/monitoring/dashboards/values.yaml
@@ -393,6 +393,10 @@ dashboards:
        file: dashboards/cassandra.json
      dashboard25:
        file: dashboards/kp-flink-jobs-metrics-dashboard.json
+     dashboard26:
+       file: dashboards/dp-flink-jobs-metrics-dashboard.json
+     dashboard27:
+       file: dashboards/dp-flink-lag-dashboard.json    
 
 dashboards1:
    temporary:

From de030976ed4c5a5bb83fe91942ef0fab7a686fb3 Mon Sep 17 00:00:00 2001
From: Manjunath Davanam <manjunathd@ilimi.in>
Date: Wed, 25 Nov 2020 14:29:22 +0530
Subject: [PATCH 046/184] Removed the unwanted grafana dashboards. (#2055)

* Issue #000 fix: KP flink jobs grafana update

* Issue #000 fix: KP flink jobs grafana update

* Issue #000 fix: Dp flink dashboard setup

* Issue #000 fix: removed the unwanted dashboard files
---
 .../helm_charts/monitoring/dashboards/values.yaml      | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/kubernetes/helm_charts/monitoring/dashboards/values.yaml b/kubernetes/helm_charts/monitoring/dashboards/values.yaml
index ea60dd75d..eb51998b2 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/values.yaml
+++ b/kubernetes/helm_charts/monitoring/dashboards/values.yaml
@@ -351,18 +351,10 @@ dashboards:
        file: dashboards/api-manager.json
      dashboard2:
        file: dashboards/device-register-apimetrics.json
-     dashboard3:
-       file: dashboards/dp-jobs-consumerLag.json
-     dashboard4:
-       file: dashboards/dp-percentage.json
      dashboard5:
        file: dashboards/druid.json
      dashboard6:
        file: dashboards/elasticsearch.json
-     dashboard7:
-       file: dashboards/ep-pipeline-metrics.json
-     dashboard8:
-       file: dashboards/ep-pipeline-consumerLag.json
      dashboard9:
        file: dashboards/host-details.json
      dashboard10:
@@ -387,8 +379,6 @@ dashboards:
        file: dashboards/weekly-report.json
      dashboard21:
        file: dashboards/process-exporter.json
-     dashboard22:
-       file: dashboards/DP-Jobs-Consumer-lag-prometheus.json
      dashboard24:
        file: dashboards/cassandra.json
      dashboard25:

From 1f945213a99332deedaea2897a707b2f2550b222 Mon Sep 17 00:00:00 2001
From: Manjunath Davanam <manjunathd@ilimi.in>
Date: Wed, 25 Nov 2020 14:41:45 +0530
Subject: [PATCH 047/184] Kp grafana setup (#2056)

* Issue #000 fix: KP flink jobs grafana update

* Issue #000 fix: KP flink jobs grafana update

* Issue #000 fix: Dp flink dashboard setup

* Issue #000 fix: removed the unwanted dashboard files

* Issue #000 fix: removed the unwanted dashboard files
---
 kubernetes/helm_charts/monitoring/dashboards/values.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kubernetes/helm_charts/monitoring/dashboards/values.yaml b/kubernetes/helm_charts/monitoring/dashboards/values.yaml
index eb51998b2..1bb051533 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/values.yaml
+++ b/kubernetes/helm_charts/monitoring/dashboards/values.yaml
@@ -383,10 +383,6 @@ dashboards:
        file: dashboards/cassandra.json
      dashboard25:
        file: dashboards/kp-flink-jobs-metrics-dashboard.json
-     dashboard26:
-       file: dashboards/dp-flink-jobs-metrics-dashboard.json
-     dashboard27:
-       file: dashboards/dp-flink-lag-dashboard.json    
 
 dashboards1:
    temporary:

From 0e4ee55e7b85fecb7969140e98869fcdddd34333 Mon Sep 17 00:00:00 2001
From: Rhea Fernandes <32357913+rheafernandes@users.noreply.github.com>
Date: Tue, 1 Dec 2020 16:17:21 +0530
Subject: [PATCH 048/184] Added changes to handle object definition in
 questions (#2061)

---
 .../templates/assessment-service_application.conf          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
index efdbefc28..047221b7c 100644
--- a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
@@ -370,3 +370,10 @@ languageCode {
   tamil : "ta"
   telugu : "te"
 }
+
+kafka {
+  urls : "{{ kafka_urls }}"
+  topic.send.enable : true
+  topics.instruction : "{{ env_name }}.learning.job.request"
+}
+objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_store"
\ No newline at end of file

From 135473878ab69d2505fd360909d385f7971bd18c Mon Sep 17 00:00:00 2001
From: Harsha <harshavardhanc95@gmail.com>
Date: Tue, 1 Dec 2020 18:13:51 +0530
Subject: [PATCH 049/184] feat: ansible role and jenkins file for mongodb
 cluster (#2060)

* ansible role and jenkins file for mongodb cluster
---
 ansible/mongodb-cluster.yml                   |  13 +
 .../roles/mongodb-cluster/defaults/main.yml   | 135 +++++
 .../roles/mongodb-cluster/handlers/main.yml   |  44 ++
 .../library/mongodb_replication.py            | 466 ++++++++++++++++++
 ansible/roles/mongodb-cluster/meta/main.yml   |  30 ++
 .../tasks/auth_initialization.yml             |  76 +++
 .../roles/mongodb-cluster/tasks/configure.yml |  87 ++++
 .../tasks/disable_transparent_hugepages.yml   |  16 +
 .../mongodb-cluster/tasks/install.amazon.yml  |  49 ++
 .../mongodb-cluster/tasks/install.debian.yml  | 113 +++++
 .../mongodb-cluster/tasks/install.redhat.yml  |  55 +++
 ansible/roles/mongodb-cluster/tasks/main.yml  | 137 +++++
 .../roles/mongodb-cluster/tasks/mms-agent.yml |  32 ++
 .../mongodb-cluster/tasks/replication.yml     |  57 +++
 .../tasks/replication_init_auth.yml           |  42 ++
 ...le-transparent-hugepages.amazon.service.j2 |  17 +
 ...le-transparent-hugepages.debian.service.j2 |  17 +
 ...le-transparent-hugepages.redhat.service.j2 |  17 +
 .../mongodb-cluster/templates/mongod.conf.j2  | 118 +++++
 .../templates/mongod_init.conf.j2             |  47 ++
 .../mongodb-cluster/templates/mongodb.repo.j2 |  10 +
 .../templates/mongodb.service.j2              |  34 ++
 .../templates/monitoring-agent.config.j2      |   3 +
 ansible/roles/mongodb-cluster/vars/Amazon.yml |  15 +
 ansible/roles/mongodb-cluster/vars/Debian.yml |   6 +
 ansible/roles/mongodb-cluster/vars/RedHat.yml |  16 +
 ansible/roles/mongodb-cluster/vars/Ubuntu.yml |   6 +
 .../provision/mongodb-cluster/Jenkinsfile     |  51 ++
 28 files changed, 1709 insertions(+)
 create mode 100644 ansible/mongodb-cluster.yml
 create mode 100644 ansible/roles/mongodb-cluster/defaults/main.yml
 create mode 100644 ansible/roles/mongodb-cluster/handlers/main.yml
 create mode 100644 ansible/roles/mongodb-cluster/library/mongodb_replication.py
 create mode 100644 ansible/roles/mongodb-cluster/meta/main.yml
 create mode 100644 ansible/roles/mongodb-cluster/tasks/auth_initialization.yml
 create mode 100644 ansible/roles/mongodb-cluster/tasks/configure.yml
 create mode 100644 ansible/roles/mongodb-cluster/tasks/disable_transparent_hugepages.yml
 create mode 100644 ansible/roles/mongodb-cluster/tasks/install.amazon.yml
 create mode 100644 ansible/roles/mongodb-cluster/tasks/install.debian.yml
 create mode 100644 ansible/roles/mongodb-cluster/tasks/install.redhat.yml
 create mode 100644 ansible/roles/mongodb-cluster/tasks/main.yml
 create mode 100644 ansible/roles/mongodb-cluster/tasks/mms-agent.yml
 create mode 100644 ansible/roles/mongodb-cluster/tasks/replication.yml
 create mode 100644 ansible/roles/mongodb-cluster/tasks/replication_init_auth.yml
 create mode 100644 ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.amazon.service.j2
 create mode 100644 ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.debian.service.j2
 create mode 100644 ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.redhat.service.j2
 create mode 100644 ansible/roles/mongodb-cluster/templates/mongod.conf.j2
 create mode 100644 ansible/roles/mongodb-cluster/templates/mongod_init.conf.j2
 create mode 100644 ansible/roles/mongodb-cluster/templates/mongodb.repo.j2
 create mode 100644 ansible/roles/mongodb-cluster/templates/mongodb.service.j2
 create mode 100644 ansible/roles/mongodb-cluster/templates/monitoring-agent.config.j2
 create mode 100644 ansible/roles/mongodb-cluster/vars/Amazon.yml
 create mode 100644 ansible/roles/mongodb-cluster/vars/Debian.yml
 create mode 100644 ansible/roles/mongodb-cluster/vars/RedHat.yml
 create mode 100644 ansible/roles/mongodb-cluster/vars/Ubuntu.yml
 create mode 100644 pipelines/provision/mongodb-cluster/Jenkinsfile

diff --git a/ansible/mongodb-cluster.yml b/ansible/mongodb-cluster.yml
new file mode 100644
index 000000000..81cab6a5f
--- /dev/null
+++ b/ansible/mongodb-cluster.yml
@@ -0,0 +1,13 @@
+- hosts: mongo
+  become: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  vars:
+    mongodb_replication_params:
+    mongodb_conf_auth: true
+    mongodb_conf_replSet: mongors
+    mongodb_conf_dbpath: /var/lib/mongodb
+    mongodb_conf_bind_ip: 0.0.0.0
+    mongodb_conf_port: 27017
+  roles:
+    - mongodb-cluster
diff --git a/ansible/roles/mongodb-cluster/defaults/main.yml b/ansible/roles/mongodb-cluster/defaults/main.yml
new file mode 100644
index 000000000..340a14c08
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/defaults/main.yml
@@ -0,0 +1,135 @@
+---
+
+mongodb_package: mongodb-org
+mongodb_package_state: present
+mongodb_version: "4.2"
+mongodb_apt_keyserver: hkp://keyserver.ubuntu.com:80 
+mongodb_apt_key_id:
+  "3.4": "0C49F3730359A14518585931BC711F9BA15703C6"
+  "3.6": "2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5"
+  "4.0": "9DA31620334BD75D9DCB49F368818C72E52529D4"
+  "4.2": "4B7C549A058F8B6B"
+
+mongodb_pymongo_from_pip: true                   # Install latest PyMongo via PIP or package manager
+mongodb_pymongo_pip_version: 3.7.1
+
+mongodb_user_update_password: "on_create"        # MongoDB user password update default policy
+mongodb_manage_service: true
+mongodb_manage_systemd_unit: true
+mongodb_systemd_unit_limit_nofile: 64000
+mongodb_systemd_unit_limit_nproc: 64000
+
+mongodb_disable_transparent_hugepages: false
+
+mongodb_use_numa: true
+
+mongodb_user: "{{ 'mongod' if ('RedHat' == ansible_os_family) else 'mongodb' }}"
+mongodb_uid:
+mongodb_gid:
+mongodb_daemon_name: "{{ 'mongod' if ('mongodb-org' in mongodb_package) else 'mongodb' }}"
+
+## net Options
+mongodb_net_bindip: 0.0.0.0                    # Comma separated list of ip addresses to listen on
+mongodb_net_http_enabled: false                  # Enable http interface
+mongodb_net_ipv6: false                          # Enable IPv6 support (disabled by default)
+mongodb_net_maxconns: 65536                      # Max number of simultaneous connections
+mongodb_net_port: 27017                          # Specify port number
+mongodb_net_ssl: disabled                        # Enable or disable ssl connections
+mongodb_net_ssl_mode: ""                         # Set the ssl mode (RequireSSL / preferSSL / AllowSSL / disabled)
+mongodb_net_ssl_pemfile: ""                      # Location of the pemfile to use for ssl
+mongodb_net_ssl_host: ""                         # Valid ssl hostname
+
+## processManagement Options
+# Fork server process
+# Enabled by default for RedHat as the init scripts assume forking is enabled.
+mongodb_processmanagement_fork: false 
+
+## security Options
+# Disable or enable security. Possible values: 'disabled', 'enabled'
+mongodb_security_authorization: "disabled"
+mongodb_security_keyfile: /etc/mongodb-keyfile   # Specify path to keyfile with password for inter-process authentication
+mongodb_security_javascript_enabled: false
+
+## storage Options
+mongodb_storage_dbpath: /data/db                 # Directory for datafiles
+mongodb_storage_dirperdb: false                  # Use one directory per DB
+
+# The storage engine for the mongod database
+mongodb_storage_engine: "wiredTiger"
+# mmapv1 specific options
+mongodb_storage_quota_enforced: false            # Limits each database to a certain number of files
+mongodb_storage_quota_maxfiles: 8                # Number of quota files per DB
+mongodb_storage_smallfiles: false                # Very useful for non-data nodes
+
+mongodb_storage_journal_enabled: true            # Enable journaling
+mongodb_storage_prealloc: true                   # Enable data file preallocation
+
+mongodb_wiredtiger_directory_for_indexes: false
+
+## systemLog Options
+## The destination to which MongoDB sends all log output. Specify either 'file' or 'syslog'.
+## If you specify 'file', you must also specify mongodb_systemlog_path.
+mongodb_systemlog_destination: "file"
+mongodb_systemlog_logappend: true                                        # Append to logpath instead of over-writing
+mongodb_systemlog_logrotate: "rename"                                    # Logrotation behavior
+mongodb_systemlog_path: /var/log/mongodb/{{ mongodb_daemon_name }}.log   # Log file to send write to instead of stdout
+
+## operationProfiling Options
+mongodb_operation_profiling_slow_op_threshold_ms: 100
+mongodb_operation_profiling_mode: "off"
+
+## cloud options (MongoDB >= 4.0)
+mongodb_cloud_monitoring_free_state: "runtime"
+
+## replication Options
+mongodb_replication_replset: "mongors"                # Enable replication
+mongodb_replication_replindexprefetch: "all"      # specify index prefetching behavior (if secondary) [none|_id_only|all]
+mongodb_replication_oplogsize: 1024               # specifies a maximum size in megabytes for the replication operation log
+
+# MMS Agent
+mongodb_mms_agent_pkg: https://cloud.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent_7.2.0.488-1_amd64.ubuntu1604.deb
+mongodb_mms_group_id: ""
+mongodb_mms_api_key: ""
+mongodb_mms_base_url: https://mms.mongodb.com
+
+#master configuration
+
+mongodb_login_host: "{{ groups['mongo_master'][0] }}"
+host_name: "{{ groups['mongo_master'][0] }}" 
+
+# password for inter-process authentication
+# please regenerate this file on production environment with command 'openssl rand -base64 741'
+mongodb_keyfile_content: |
+  8pYcxvCqoe89kcp33KuTtKVf5MoHGEFjTnudrq5BosvWRoIxLowmdjrmUpVfAivh
+  CHjqM6w0zVBytAxH1lW+7teMYe6eDn2S/O/1YlRRiW57bWU3zjliW3VdguJar5i9
+  Z+1a8lI+0S9pWynbv9+Ao0aXFjSJYVxAm/w7DJbVRGcPhsPmExiSBDw8szfQ8PAU
+  2hwRl7nqPZZMMR+uQThg/zV9rOzHJmkqZtsO4UJSilG9euLCYrzW2hdoPuCrEDhu
+  Vsi5+nwAgYR9dP2oWkmGN1dwRe0ixSIM2UzFgpaXZaMOG6VztmFrlVXh8oFDRGM0
+  cGrFHcnGF7oUGfWnI2Cekngk64dHA2qD7WxXPbQ/svn9EfTY5aPw5lXzKA87Ds8p
+  KHVFUYvmA6wVsxb/riGLwc+XZlb6M9gqHn1XSpsnYRjF6UzfRcRR2WyCxLZELaqu
+  iKxLKB5FYqMBH7Sqg3qBCtE53vZ7T1nefq5RFzmykviYP63Uhu/A2EQatrMnaFPl
+  TTG5CaPjob45CBSyMrheYRWKqxdWN93BTgiTW7p0U6RB0/OCUbsVX6IG3I9N8Uqt
+  l8Kc+7aOmtUqFkwo8w30prIOjStMrokxNsuK9KTUiPu2cj7gwYQ574vV3hQvQPAr
+  hhb9ohKr0zoPQt31iTj0FDkJzPepeuzqeq8F51HB56RZKpXdRTfY8G6OaOT68cV5
+  vP1O6T/okFKrl41FQ3CyYN5eRHyRTK99zTytrjoP2EbtIZ18z+bg/angRHYNzbgk
+  lc3jpiGzs1ZWHD0nxOmHCMhU4usEcFbV6FlOxzlwrsEhHkeiununlCsNHatiDgzp
+  ZWLnP/mXKV992/Jhu0Z577DHlh+3JIYx0PceB9yzACJ8MNARHF7QpBkhtuGMGZpF
+  T+c73exupZFxItXs1Bnhe3djgE3MKKyYvxNUIbcTJoe7nhVMrwO/7lBSpVLvC4p3
+  wR700U0LDaGGQpslGtiE56SemgoP
+
+
+# names and passwords for administrative users
+mongodb_user_admin_name: 
+mongodb_user_admin_password:  
+
+mongodb_root_admin_name: 
+mongodb_root_admin_password:  
+
+mongodb_root_backup_name: 
+mongodb_root_backup_password:  
+
+# setParameter config
+mongodb_set_parameters:
+
+# custom config options
+mongodb_config:
diff --git a/ansible/roles/mongodb-cluster/handlers/main.yml b/ansible/roles/mongodb-cluster/handlers/main.yml
new file mode 100644
index 000000000..62251cf1c
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/handlers/main.yml
@@ -0,0 +1,44 @@
+---
+
+- name: reload systemd
+  systemd:
+    daemon_reload: yes
+
+- name: run disable-transparent-hugepages
+  systemd:
+    name: disable-transparent-hugepages
+    enabled: true
+    state: started
+    daemon_reload: yes
+
+- name: mongodb restart
+  service:
+    name: "{{ mongodb_daemon_name }}"
+    state: restarted
+  when: mongodb_manage_service | bool
+
+- name: mongodb-mms-monitoring-agent restart
+  service:
+    name: mongodb-mms-monitoring-agent
+    state: restarted
+  when: mongodb_manage_service | bool
+
+- name: restart sysfsutils
+  service:
+    name: sysfsutils
+    state: restarted
+
+- name: wait when mongodb is started
+  wait_for:
+    host: "{{ item }}"
+    port: "{{ mongodb_net_port }}"
+    timeout: 120
+  with_items: "{{ mongodb_net_bindip.split(',') | map('replace', '0.0.0.0', '127.0.0.1') | list }}"
+
+- name: wait when mongodb is started on localhost
+  wait_for:
+    host: "127.0.0.1"
+    port: "{{ mongodb_net_port }}"
+    delay: 5
+    timeout: 120
+
diff --git a/ansible/roles/mongodb-cluster/library/mongodb_replication.py b/ansible/roles/mongodb-cluster/library/mongodb_replication.py
new file mode 100644
index 000000000..edc2253f7
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/library/mongodb_replication.py
@@ -0,0 +1,466 @@
+#!/usr/bin/python
+
+# (c) 2015-2018, Sergei Antipov, 2GIS LLC
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+DOCUMENTATION = '''
+---
+module: mongodb_replication
+short_description: Adds or removes a node from a MongoDB Replica Set.
+description:
+    - Adds or removes host from a MongoDB replica set. Initialize replica set if it needed.
+version_added: "2.4"
+options:
+    login_user:
+        description:
+            - The username used to authenticate with
+        required: false
+        default: null
+    login_password:
+        description:
+            - The password used to authenticate with
+        required: false
+        default: null
+    login_host:
+        description:
+            - The host running the database
+        required: false
+        default: localhost
+    login_port:
+        description:
+            - The port to connect to
+        required: false
+        default: 27017
+    login_database:
+        description:
+            - The database where login credentials are stored
+        required: false
+        default: admin
+    replica_set:
+        description:
+            - Replica set to connect to (automatically connects to primary for writes)
+        required: false
+        default: null
+    host_name:
+        description:
+            - The name of the host to add/remove from replica set
+        required: true
+    host_port:
+        description:
+            - The port of the host, which should be added/deleted from RS
+        required: true
+        default: null
+    host_type:
+        description:
+            - The type of the host in replica set
+        required: false
+        default: replica
+        choices: [ "replica", "arbiter" ]
+    ssl:
+        description:
+            - Whether to use an SSL connection when connecting to the database
+        default: False
+    ssl_cert_reqs:
+        description:
+            - Specifies whether a certificate is required from the other side of the connection, and whether it will be validated if provided.
+        required: false
+        default: "CERT_REQUIRED"
+        choices: ["CERT_REQUIRED", "CERT_OPTIONAL", "CERT_NONE"]
+    build_indexes:
+        description:
+            - Determines whether the mongod builds indexes on this member.
+        required: false
+        default: true
+    hidden:
+        description:
+            - When this value is true, the replica set hides this instance,
+              and does not include the member in the output of db.isMaster()
+              or isMaster
+        required: false
+        default: false
+    priority:
+        description:
+            - A number that indicates the relative eligibility of a member
+              to become a primary
+        required: false
+        default: 1.0
+    slave_delay:
+        description:
+            - The number of seconds behind the primary that this replica set
+              member should lag
+        required: false
+        default: 0
+    votes:
+        description:
+            - The number of votes a server will cast in a replica set election
+        default: 1
+    state:
+        state:
+        description:
+            - The replica set member state
+        required: false
+        default: present
+        choices: [ "present", "absent" ]
+notes:
+    - Requires the pymongo Python package on the remote host, version 3.2+. It
+      can be installed using pip or the OS package manager. @see http://api.mongodb.org/python/current/installation.html
+requirements: [ "pymongo" ]
+author: "Sergei Antipov @UnderGreen"
+'''
+
+EXAMPLES = '''
+# Add 'mongo1.dev:27017' host into replica set as replica (Replica will be initiated if it not exists)
+- mongodb_replication: replica_set=replSet host_name=mongo1.dev host_port=27017 state=present
+
+# Add 'mongo2.dev:30000' host into replica set as arbiter
+- mongodb_replication: replica_set=replSet host_name=mongo2.dev host_port=30000 host_type=arbiter state=present
+
+# Add 'mongo3.dev:27017' host into replica set as replica and authorization params
+- mongodb_replication: replica_set=replSet login_host=mongo1.dev login_user=siteRootAdmin login_password=123456 host_name=mongo3.dev host_port=27017 state=present
+
+# Add 'mongo4.dev:27017' host into replica set as replica via SSL
+- mongodb_replication: replica_set=replSet host_name=mongo4.dev host_port=27017 ssl=True state=present
+
+# Remove 'mongo4.dev:27017' host from the replica set
+- mongodb_replication: replica_set=replSet host_name=mongo4.dev host_port=27017 state=absent
+'''
+
+RETURN = '''
+host_name:
+  description: The name of the host to add/remove from replica set
+  returned: success
+  type: string
+  sample: "mongo3.dev"
+host_port:
+  description: The port of the host, which should be added/deleted from RS
+  returned: success
+  type: int
+  sample: 27017
+host_type:
+  description: The type of the host in replica set
+  returned: success
+  type: string
+  sample: "replica"
+'''
+import ConfigParser
+import ssl as ssl_lib
+import time
+from datetime import datetime as dtdatetime
+from distutils.version import LooseVersion
+try:
+    from pymongo.errors import ConnectionFailure
+    from pymongo.errors import OperationFailure
+    from pymongo.errors import ConfigurationError
+    from pymongo.errors import AutoReconnect
+    from pymongo.errors import ServerSelectionTimeoutError
+    from pymongo import version as PyMongoVersion
+    from pymongo import MongoClient
+except ImportError:
+    pymongo_found = False
+else:
+    pymongo_found = True
+
+# =========================================
+# MongoDB module specific support methods.
+#
+def check_compatibility(module, client):
+    srv_info = client.server_info()
+    if LooseVersion(PyMongoVersion) <= LooseVersion('3.2'):
+        module.fail_json(msg='Note: you must use pymongo 3.2+')
+    if LooseVersion(srv_info['version']) >= LooseVersion('3.4') and LooseVersion(PyMongoVersion) <= LooseVersion('3.4'):
+        module.fail_json(msg='Note: you must use pymongo 3.4+ with MongoDB 3.4.x')
+    if LooseVersion(srv_info['version']) >= LooseVersion('3.6') and LooseVersion(PyMongoVersion) <= LooseVersion('3.6'):
+        module.fail_json(msg='Note: you must use pymongo 3.6+ with MongoDB 3.6.x')
+
+
+def check_members(state, module, client, host_name, host_port, host_type):
+    admin_db = client['admin']
+    local_db = client['local']
+
+    if local_db.system.replset.count() > 1:
+        module.fail_json(msg='local.system.replset has unexpected contents')
+
+    cfg = local_db.system.replset.find_one()
+    if not cfg:
+        module.fail_json(msg='no config object retrievable from local.system.replset')
+
+    for member in cfg['members']:
+        if state == 'present':
+            if host_type == 'replica':
+                if "{0}:{1}".format(host_name, host_port) in member['host']:
+                    module.exit_json(changed=False, host_name=host_name, host_port=host_port, host_type=host_type)
+            else:
+                if "{0}:{1}".format(host_name, host_port) in member['host'] and member['arbiterOnly']:
+                    module.exit_json(changed=False, host_name=host_name, host_port=host_port, host_type=host_type)
+        else:
+            if host_type == 'replica':
+                if "{0}:{1}".format(host_name, host_port) not in member['host']:
+                    module.exit_json(changed=False, host_name=host_name, host_port=host_port, host_type=host_type)
+            else:
+                if "{0}:{1}".format(host_name, host_port) not in member['host'] and member['arbiterOnly']:
+                    module.exit_json(changed=False, host_name=host_name, host_port=host_port, host_type=host_type)
+
+def add_host(module, client, host_name, host_port, host_type, timeout=180, **kwargs):
+    start_time = dtdatetime.now()
+    while True:
+        try:
+            admin_db = client['admin']
+            local_db = client['local']
+
+            if local_db.system.replset.count() > 1:
+                module.fail_json(msg='local.system.replset has unexpected contents')
+
+            cfg = local_db.system.replset.find_one()
+            if not cfg:
+                module.fail_json(msg='no config object retrievable from local.system.replset')
+
+            cfg['version'] += 1
+            max_id = max(cfg['members'], key=lambda x:x['_id'])
+            new_host = { '_id': max_id['_id'] + 1, 'host': "{0}:{1}".format(host_name, host_port) }
+            if host_type == 'arbiter':
+                new_host['arbiterOnly'] = True
+
+            if not kwargs['build_indexes']:
+                new_host['buildIndexes'] = False
+
+            if kwargs['hidden']:
+                new_host['hidden'] = True
+
+            if kwargs['priority'] != 1.0:
+                new_host['priority'] = kwargs['priority']
+
+            if kwargs['slave_delay'] != 0:
+                new_host['slaveDelay'] = kwargs['slave_delay']
+
+            if kwargs['votes'] != 1:
+                new_host['votes'] = kwargs['votes']
+
+            cfg['members'].append(new_host)
+            admin_db.command('replSetReconfig', cfg)
+            return
+        except (OperationFailure, AutoReconnect) as e:
+            if (dtdatetime.now() - start_time).seconds > timeout:
+                module.fail_json(msg='reached timeout while waiting for rs.reconfig(): %s' % str(e))
+            time.sleep(5)
+
+def remove_host(module, client, host_name, timeout=180):
+    start_time = dtdatetime.now()
+    while True:
+        try:
+            admin_db = client['admin']
+            local_db = client['local']
+
+            if local_db.system.replset.count() > 1:
+                module.fail_json(msg='local.system.replset has unexpected contents')
+
+            cfg = local_db.system.replset.find_one()
+            if not cfg:
+                module.fail_json(msg='no config object retrievable from local.system.replset')
+
+            cfg['version'] += 1
+
+            if len(cfg['members']) == 1:
+                module.fail_json(msg="You can't delete last member of replica set")
+            for member in cfg['members']:
+                if host_name in member['host']:
+                    cfg['members'].remove(member)
+                else:
+                    fail_msg = "couldn't find member with hostname: {0} in replica set members list".format(host_name)
+                    module.fail_json(msg=fail_msg)
+        except (OperationFailure, AutoReconnect) as e:
+            if (dtdatetime.now() - start_time).seconds > timeout:
+                module.fail_json(msg='reached timeout while waiting for rs.reconfig(): %s' % str(e))
+            time.sleep(5)
+
+def load_mongocnf():
+    config = ConfigParser.RawConfigParser()
+    mongocnf = os.path.expanduser('~/.mongodb.cnf')
+
+    try:
+        config.readfp(open(mongocnf))
+        creds = dict(
+          user=config.get('client', 'user'),
+          password=config.get('client', 'pass')
+        )
+    except (ConfigParser.NoOptionError, IOError):
+        return False
+
+    return creds
+
+def wait_for_ok_and_master(module, connection_params, timeout = 180):
+    start_time = dtdatetime.now()
+    while True:
+        try:
+            client = MongoClient(**connection_params)
+            authenticate(client, connection_params["username"], connection_params["password"])
+
+            status = client.admin.command('replSetGetStatus', check=False)
+            if status['ok'] == 1 and status['myState'] == 1:
+                return
+
+        except ServerSelectionTimeoutError:
+            pass
+
+        client.close()
+
+        if (dtdatetime.now() - start_time).seconds > timeout:
+            module.fail_json(msg='reached timeout while waiting for rs.status() to become ok=1')
+
+        time.sleep(1)
+
+def authenticate(client, login_user, login_password):
+    if login_user is None and login_password is None:
+        mongocnf_creds = load_mongocnf()
+        if mongocnf_creds is not False:
+            login_user = mongocnf_creds['user']
+            login_password = mongocnf_creds['password']
+        elif login_password is None and login_user is not None:
+            module.fail_json(msg='when supplying login arguments, both login_user and login_password must be provided')
+
+    if login_user is not None and login_password is not None:
+        client.admin.authenticate(login_user, login_password)
+
+# =========================================
+# Module execution.
+#
+
+def main():
+    module = AnsibleModule(
+        argument_spec = dict(
+            login_user=dict(default=None),
+            login_password=dict(default=None, no_log=True),
+            login_host=dict(default='localhost'),
+            login_port=dict(default='27017'),
+            login_database=dict(default="admin"),
+            replica_set=dict(default=None),
+            host_name=dict(default='localhost'),
+            host_port=dict(default='27017'),
+            host_type=dict(default='replica', choices=['replica','arbiter']),
+            ssl=dict(default=False, type='bool'),
+            ssl_cert_reqs=dict(default='CERT_REQUIRED', choices=['CERT_NONE', 'CERT_OPTIONAL', 'CERT_REQUIRED']),
+            build_indexes = dict(type='bool', default='yes'),
+            hidden = dict(type='bool', default='no'),
+            priority = dict(default='1.0'),
+            slave_delay = dict(type='int', default='0'),
+            votes = dict(type='int', default='1'),
+            state=dict(default='present', choices=['absent', 'present']),
+        )
+    )
+
+    if not pymongo_found:
+        module.fail_json(msg='the python pymongo (>= 3.2) module is required')
+
+    login_user = module.params['login_user']
+    login_password = module.params['login_password']
+    login_host = module.params['login_host']
+    login_port = module.params['login_port']
+    login_database = module.params['login_database']
+    replica_set = module.params['replica_set']
+    host_name = module.params['host_name']
+    host_port = module.params['host_port']
+    host_type = module.params['host_type']
+    ssl = module.params['ssl']
+    state = module.params['state']
+    priority = float(module.params['priority'])
+
+    replica_set_created = False
+
+    try:
+        if replica_set is None:
+            module.fail_json(msg='replica_set parameter is required')
+        else:
+            connection_params = {
+                "host": login_host,
+                "port": int(login_port),
+                "username": login_user,
+                "password": login_password,
+                "authsource": login_database,
+                "serverselectiontimeoutms": 5000,
+                "replicaset": replica_set,
+            }
+
+        if ssl:
+            connection_params["ssl"] = ssl
+            connection_params["ssl_cert_reqs"] = getattr(ssl_lib, module.params['ssl_cert_reqs'])
+
+        client = MongoClient(**connection_params)
+        authenticate(client, login_user, login_password)
+        client['admin'].command('replSetGetStatus')
+
+    except ServerSelectionTimeoutError:
+        try:
+            connection_params = {
+                "host": login_host,
+                "port": int(login_port),
+                "username": login_user,
+                "password": login_password,
+                "authsource": login_database,
+                "serverselectiontimeoutms": 10000,
+            }
+
+            if ssl:
+                connection_params["ssl"] = ssl
+                connection_params["ssl_cert_reqs"] = getattr(ssl_lib, module.params['ssl_cert_reqs'])
+
+            client = MongoClient(**connection_params)
+            authenticate(client, login_user, login_password)
+            if state == 'present':
+                new_host = { '_id': 0, 'host': "{0}:{1}".format(host_name, host_port) }
+                if priority != 1.0: new_host['priority'] = priority
+                config = { '_id': "{0}".format(replica_set), 'members': [new_host] }
+                client['admin'].command('replSetInitiate', config)
+                client.close()
+                wait_for_ok_and_master(module, connection_params)
+                replica_set_created = True
+                module.exit_json(changed=True, host_name=host_name, host_port=host_port, host_type=host_type)
+        except OperationFailure as e:
+            module.fail_json(msg='Unable to initiate replica set: %s' % str(e))
+    except ConnectionFailure as e:
+        module.fail_json(msg='unable to connect to database: %s' % str(e))
+
+    # reconnect again
+    client = MongoClient(**connection_params)
+    authenticate(client, login_user, login_password)
+    check_compatibility(module, client)
+    check_members(state, module, client, host_name, host_port, host_type)
+
+    if state == 'present':
+        if host_name is None and not replica_set_created:
+            module.fail_json(msg='host_name parameter required when adding new host into replica set')
+
+        try:
+            if not replica_set_created:
+                add_host(module, client, host_name, host_port, host_type,
+                        build_indexes   = module.params['build_indexes'],
+                        hidden          = module.params['hidden'],
+                        priority        = float(module.params['priority']),
+                        slave_delay     = module.params['slave_delay'],
+                        votes           = module.params['votes'])
+        except OperationFailure as e:
+            module.fail_json(msg='Unable to add new member to replica set: %s' % str(e))
+
+    elif state == 'absent':
+        try:
+            remove_host(module, client, host_name)
+        except OperationFailure as e:
+            module.fail_json(msg='Unable to remove member of replica set: %s' % str(e))
+
+    module.exit_json(changed=True, host_name=host_name, host_port=host_port, host_type=host_type)
+
+# import module snippets
+from ansible.module_utils.basic import *
+main()
diff --git a/ansible/roles/mongodb-cluster/meta/main.yml b/ansible/roles/mongodb-cluster/meta/main.yml
new file mode 100644
index 000000000..94bbca05a
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/meta/main.yml
@@ -0,0 +1,30 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: Sergei Antipov
+  company: Self-employed
+  description: Manage MongoDB with authentication and replica sets
+  license: GPLv2
+  min_ansible_version: 2.5
+  platforms:
+    - name: Ubuntu
+      versions:
+        - trusty
+        - xenial
+        - bionic
+    - name: Debian
+      versions:
+        - jessie
+        - stretch
+    - name: EL
+      versions:
+        - 6
+        - 7
+    - name: Amazon
+      versions:
+        - Candidate
+  galaxy_tags:
+    - database
+    - nosql
+    - mongodb
diff --git a/ansible/roles/mongodb-cluster/tasks/auth_initialization.yml b/ansible/roles/mongodb-cluster/tasks/auth_initialization.yml
new file mode 100644
index 000000000..033071ff3
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/tasks/auth_initialization.yml
@@ -0,0 +1,76 @@
+---
+- name: Use different mongod.conf for auth initialization
+  template:
+    src: mongod_init.conf.j2
+    dest: /etc/mongod.conf
+    owner: root
+    group: root
+    mode: 0644
+  notify:
+    - mongodb restart
+    - wait when mongodb is started on localhost
+
+- name: Flush all handlers at this point
+  meta: flush_handlers
+
+- name: create administrative user "{{ mongodb_user_admin_name }}"
+  mongodb_user:
+    database: admin
+    name: "{{ item.name }}"
+    password: "{{ item.password }}"
+    update_password: "{{ mongodb_user_update_password }}"
+    roles: "{{ item.roles }}"
+    login_port: "{{ mongodb_net_port }}"
+  with_items:
+    - {
+      name: "{{ mongodb_user_admin_name }}",
+      password: "{{ mongodb_user_admin_password }}",
+      roles: "userAdminAnyDatabase"
+      }
+  no_log: true
+
+- name: create administrative user "{{ mongodb_root_admin_name }}"
+  mongodb_user:
+    database: admin
+    name: "{{ item.name }}"
+    password: "{{ item.password }}"
+    update_password: "{{ mongodb_user_update_password }}"
+    roles: "{{ item.roles }}"
+    login_port: "{{ mongodb_net_port }}"
+  with_items:
+    - {
+      name: "{{ mongodb_root_admin_name }}",
+      password: "{{ mongodb_root_admin_password }}",
+      roles: "root"
+      }
+  no_log: true
+
+- name: create backup user "{{ mongodb_root_backup_name }}"
+  mongodb_user:
+    database: admin
+    name: "{{ item.name }}"
+    password: "{{ item.password }}"
+    update_password: "{{ mongodb_user_update_password }}"
+    roles: "{{ item.roles }}"
+    login_port: "{{ mongodb_net_port }}"
+  with_items:
+    - {
+      name: "{{ mongodb_root_backup_name }}",
+      password: "{{ mongodb_root_backup_password }}",
+      roles: "backup,clusterMonitor"
+      }
+  no_log: true
+
+- name: Move back mongod.conf
+  template:
+    src: mongod.conf.j2
+    dest: /etc/mongod.conf
+    owner: root
+    group: root
+    mode: 0644
+  notify:
+    - mongodb restart
+    - wait when mongodb is started on localhost
+
+- name: Flush all handlers at this point
+  meta: flush_handlers
diff --git a/ansible/roles/mongodb-cluster/tasks/configure.yml b/ansible/roles/mongodb-cluster/tasks/configure.yml
new file mode 100644
index 000000000..5abfd2fea
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/tasks/configure.yml
@@ -0,0 +1,87 @@
+---
+- name: create mongodb group
+  group:
+    name: "{{ mongodb_user }}"
+    state: present
+
+- name: create mongodb user
+  user:
+    name: "{{ mongodb_user }}"
+    group: "{{ mongodb_user }}"
+    state: present
+
+# Workaround because default(omit) is not working. At least in Ansible 2.8.
+
+- name: set mongodb gid
+  group:
+    name: "{{ mongodb_user }}"
+    gid: "{{ mongodb_gid }}"
+    state: present
+  when: mongodb_gid is defined
+
+- name: set mongodb uid
+  user:
+    name: "{{ mongodb_user }}"
+    uid: "{{ mongodb_uid }}"
+    group: "{{ mongodb_user }}"
+    state: present
+  when: mongodb_uid is defined
+
+- name: Create keyFile
+  copy:
+    dest: "{{ mongodb_security_keyfile }}"
+    content: "{{ mongodb_keyfile_content }}"
+    owner: "{{ mongodb_user }}"
+    group: "root"
+    mode: 0600
+  when: mongodb_replication_replset | length > 0
+
+- name: Create log dir if missing
+  file:
+    state: directory
+    dest: "{{ mongodb_systemlog_path|dirname }}"
+    owner: "{{ mongodb_user }}"
+    group: "{{ mongodb_user }}"
+    mode: 0755
+  when: mongodb_systemlog_destination == "file"
+
+- name: Check than logfile exists
+  stat: path={{ mongodb_systemlog_path }}
+  register: logfile_stat
+  when: mongodb_systemlog_destination == "file"
+
+- name: Create log if missing
+  file:
+    state: touch
+    dest: "{{ mongodb_systemlog_path }}"
+    owner: "{{ mongodb_user }}"
+    group: "{{ mongodb_user }}"
+    mode: 0644
+  when: ( mongodb_systemlog_destination == "file"
+        and logfile_stat is defined
+        and not logfile_stat.stat.exists )
+
+- name: Ensure dbpath directory
+  file:
+    path: "{{ mongodb_storage_dbpath }}"
+    state: directory
+    owner: "{{ mongodb_user }}"
+    group: "{{ mongodb_user }}"
+    setype: 'mongod_var_lib_t'
+    recurse: true
+    follow: true
+
+- name: Configure mongodb
+  template:
+    src: mongod.conf.j2
+    dest: /etc/mongod.conf
+    backup: true
+    owner: root
+    group: root
+    mode: 0644
+  notify:
+    - mongodb restart
+    - wait when mongodb is started on localhost
+
+- name: Flush all handlers at this point
+  meta: flush_handlers
diff --git a/ansible/roles/mongodb-cluster/tasks/disable_transparent_hugepages.yml b/ansible/roles/mongodb-cluster/tasks/disable_transparent_hugepages.yml
new file mode 100644
index 000000000..654674ba7
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/tasks/disable_transparent_hugepages.yml
@@ -0,0 +1,16 @@
+---
+- name: Create disable transparent hugepages systemd service file
+  template:
+    src: "{{ item }}"
+    dest: /etc/systemd/system/disable-transparent-hugepages.service
+    owner: root
+    group: root
+    mode: 0644
+  with_first_found:
+    - "disable-transparent-hugepages.{{ ansible_distribution | lower }}.service.j2"
+    - "disable-transparent-hugepages.{{ ansible_os_family | lower }}.service.j2"
+  notify: "run disable-transparent-hugepages"
+  when:
+    - ansible_service_mgr == "systemd"
+    - mongodb_disable_transparent_hugepages | bool
+
diff --git a/ansible/roles/mongodb-cluster/tasks/install.amazon.yml b/ansible/roles/mongodb-cluster/tasks/install.amazon.yml
new file mode 100644
index 000000000..783298a4d
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/tasks/install.amazon.yml
@@ -0,0 +1,49 @@
+---
+- name: Establish some role-related facts
+  set_fact:
+    mongodb_major_version: "{{ mongodb_version[0:3] }}"
+
+- name: Add YUM repository
+  template:
+    src: mongodb.repo.j2
+    dest: /etc/yum.repos.d/mongodb.repo
+    mode: 0644
+  with_items: "{{ mongodb_major_version }}"
+  loop_control:
+    loop_var: version_item
+  when: mongodb_package == 'mongodb-org'
+
+- name: Install MongoDB package
+  yum:
+    name: "{{ mongodb_package }}{% if (mongodb_version | length > 3) %}={{ mongodb_version }}{% endif %}"
+    state: "{{ mongodb_package_state }}"
+    lock_timeout: "{{ yum_lock_timeout }}"
+
+- name: Install numactl package
+  yum:
+    name: numactl
+    state: present
+    lock_timeout: "{{ yum_lock_timeout }}"
+  when: mongodb_use_numa | bool
+
+- name: Install PyMongo package
+  yum:
+    name: python-pymongo
+    state: present
+    lock_timeout: "{{ yum_lock_timeout }}"
+  when: not mongodb_pymongo_from_pip
+
+- name: Install PIP
+  yum:
+    name:
+      - python-devel
+      - python-pip
+    lock_timeout: "{{ yum_lock_timeout }}"
+  when: mongodb_pymongo_from_pip
+
+- name: Install PyMongo from PIP
+  pip:
+    name: pymongo
+    state: "{{ mongodb_pymongo_pip_version is defined | ternary('present', 'latest') }}"
+    version: "{{ mongodb_pymongo_pip_version | default(omit) }}"
+  when: mongodb_pymongo_from_pip
diff --git a/ansible/roles/mongodb-cluster/tasks/install.debian.yml b/ansible/roles/mongodb-cluster/tasks/install.debian.yml
new file mode 100644
index 000000000..9daf1a243
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/tasks/install.debian.yml
@@ -0,0 +1,113 @@
+---
+- name: Establish some role-related facts
+  set_fact:
+    mongodb_major_version: "{{ mongodb_version[0:3] }}"
+
+- name: Disable transparent huge pages on systemd systems
+  include_tasks: disable_transparent_hugepages.yml
+  when:
+    - mongodb_disable_transparent_hugepages | bool
+    - ansible_service_mgr == "systemd"
+
+      #- name: Add APT key
+      #  apt_key:
+      #    keyserver: "{{ mongodb_apt_keyserver }}"
+      #    id: "{{ mongodb_apt_key_id[mongodb_major_version] }}"
+      #  when: mongodb_package == 'mongodb-org'
+
+- name: Add APT Key
+  become: yes
+  shell: "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 4B7C549A058F8B6B"
+
+- name: Fail when used wrong mongodb_version variable with Debian Stretch
+  fail:
+    msg: "mongodb_version variable should be '3.6' or '4.0' or '4.2' for Debian Stretch"
+  when:
+    - mongodb_package == 'mongodb-org'
+    - (mongodb_major_version != '3.6' and mongodb_major_version != '4.0' and mongodb_major_version != '4.2')
+    - ansible_distribution_release == 'stretch'
+
+- name: Fail when used wrong mongodb_version variable with Ubuntu 18.04
+  fail:
+    msg: "mongodb_version variable should be '4.0' or '4.2', or else mongodb_package should be 'mongodb' for Ubuntu 18.04"
+  when:
+    - mongodb_package == 'mongodb-org'
+    - (mongodb_major_version != '4.0' and mongodb_major_version != '4.2')
+    - ansible_distribution_release == "bionic"
+
+- name: Fail when used wrong mongodb_version variable
+  fail:
+    msg: "mongodb_version variable should be '3.4', '3.6' or '4.0' or '4.2'"
+  when: (mongodb_package == 'mongodb-org' and
+        (mongodb_version is not defined
+         or mongodb_repository[mongodb_major_version] is not defined))
+
+- name: Add APT repository
+  apt_repository:
+    repo: "{{ mongodb_repository[version_item] }}"
+    update_cache: true
+  with_items: "{{ mongodb_major_version }}"
+  loop_control:
+    loop_var: version_item
+  when: mongodb_package == 'mongodb-org'
+
+- name: Install MongoDB package
+  apt:
+    name: "{{ mongodb_package }}{% if (mongodb_version | length > 3) %}={{ mongodb_version }}{% endif %}"
+    state: "{{ mongodb_package_state }}"
+    update_cache: true
+
+- name: Install numactl package
+  apt:
+    name: numactl
+    state: present
+  when: mongodb_use_numa | bool
+
+- name: Add systemd configuration if present
+  template:
+    src: mongodb.service.j2
+    dest: "/lib/systemd/system/{{mongodb_daemon_name}}.service"
+    owner: root
+    group: root
+    mode: '0644'
+  when:
+    - ansible_service_mgr == "systemd"
+    - mongodb_manage_systemd_unit | bool
+  notify:
+    - reload systemd
+
+- name: Add symlink for systemd
+  file:
+    src: "/lib/systemd/system/{{mongodb_daemon_name}}.service"
+    dest: "/etc/systemd/system/multi-user.target.wants/{{mongodb_daemon_name}}.service"
+    state: link
+  when:
+    - ansible_service_mgr == "systemd"
+    - mongodb_manage_systemd_unit | bool
+  notify:
+    - reload systemd
+
+- name: Install PyMongo package
+  apt:
+    name: python-pymongo
+  when: not mongodb_pymongo_from_pip
+
+- name: Install PIP
+  apt:
+    pkg:
+      - python-dev
+      - python-pip
+  when: mongodb_pymongo_from_pip | bool
+
+- name: Install setuptools (required for ansible 2.7+)
+  apt:
+    pkg:
+      - python-setuptools
+  when: mongodb_pymongo_from_pip | bool
+
+- name: Install PyMongo from PIP
+  pip:
+    name: pymongo
+    state: "{{ mongodb_pymongo_pip_version is defined | ternary('present', 'latest') }}"
+    version: "{{ mongodb_pymongo_pip_version | default(omit) }}"
+  when: mongodb_pymongo_from_pip | bool
diff --git a/ansible/roles/mongodb-cluster/tasks/install.redhat.yml b/ansible/roles/mongodb-cluster/tasks/install.redhat.yml
new file mode 100644
index 000000000..f2829181b
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/tasks/install.redhat.yml
@@ -0,0 +1,55 @@
+---
+
+- name: Establish some role-related facts
+  set_fact:
+    mongodb_major_version: "{{ mongodb_version[0:3] }}"
+
+- name: Install EPEL release repository
+  package:
+    name: epel-release
+    state: present
+
+- name: Add YUM repository
+  template:
+    src: mongodb.repo.j2
+    dest: /etc/yum.repos.d/mongodb.repo
+    mode: 0644
+  with_items: "{{ mongodb_major_version }}"
+  loop_control:
+    loop_var: version_item
+  when: mongodb_package == 'mongodb-org'
+
+- name: Install MongoDB package
+  yum:
+    name: "{{ mongodb_package }}{% if (mongodb_version | length > 3) %}={{ mongodb_version }}{% endif %}"
+    state: "{{ mongodb_package_state }}"
+    lock_timeout: "{{ yum_lock_timeout }}"
+
+- name: Install numactl package
+  yum:
+    name: numactl
+    state: present
+    lock_timeout: "{{ yum_lock_timeout }}"
+  when: mongodb_use_numa | bool
+
+- name: Install PyMongo package
+  yum:
+    name: python-pymongo
+    state: present
+    lock_timeout: "{{ yum_lock_timeout }}"
+  when: not mongodb_pymongo_from_pip
+
+- name: Install PIP
+  yum:
+    name:
+      - python-devel
+      - python-pip
+    lock_timeout: "{{ yum_lock_timeout }}"
+  when: mongodb_pymongo_from_pip | bool
+
+- name: Install PyMongo from PIP
+  pip:
+    name: pymongo
+    state: "{{ mongodb_pymongo_pip_version is defined | ternary('present', 'latest') }}"
+    version: "{{ mongodb_pymongo_pip_version | default(omit) }}"
+  when: mongodb_pymongo_from_pip | bool
diff --git a/ansible/roles/mongodb-cluster/tasks/main.yml b/ansible/roles/mongodb-cluster/tasks/main.yml
new file mode 100644
index 000000000..2ab22c9c1
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/tasks/main.yml
@@ -0,0 +1,137 @@
+---
+
+- name: Check value of variable mongodb_net_ssl_host
+  fail:
+    msg: 'Set mongodb_net_ssl_mode is preferSSL or set valid hostname for mongodb_net_ssl_host!'
+  when: ( mongodb_net_ssl_mode == 'requireSSL'
+          and mongodb_net_ssl_host == '' )
+
+- name: Check value of variable mongodb_login_host
+  fail:
+    msg: 'Set mongodb_login_host equal mongodb_net_ssl_host!'
+  when: ( mongodb_net_ssl_mode == 'requireSSL'
+          and mongodb_net_ssl_host != mongodb_login_host
+          and not mongodb_replication_replset )
+
+- name: Include OS-specific variables
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution_release }}.yml"
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
+
+- name: Include installation tasks
+  include: "{{ item }}"
+  with_first_found:
+    - "install.{{ ansible_distribution | lower }}.yml"
+    - "install.{{ ansible_os_family | lower }}.yml"
+  tags: [mongodb]
+
+- name: Include configuration.yml
+  include: configure.yml
+  tags: [mongodb]
+
+- name: Include replication and auth configuration
+  include: replication_init_auth.yml
+  when: ( mongodb_replication_replset | length > 0
+        and mongodb_security_authorization == 'enabled'
+        and mongodb_master is defined and mongodb_master )
+  tags: [mongodb]
+
+- name: Include replication configuration
+  include: replication.yml
+  when: mongodb_replication_replset | length > 0
+  tags: [mongodb]
+
+- name: Check where admin user already exists
+  command: >
+    mongo --quiet {{ '--ssl --host ' + mongodb_net_ssl_host if mongodb_net_ssl_mode == 'requireSSL' else '' }} -u {{ mongodb_user_admin_name }} \
+          -p {{ mongodb_user_admin_password }} --port {{ mongodb_net_port }} --eval 'db.version()' admin
+  register: mongodb_user_admin_check
+  changed_when: false
+  check_mode: no
+  ignore_errors: true
+  when: ( mongodb_security_authorization == 'enabled'
+          and not mongodb_replication_replset )
+  no_log: true
+  tags: [mongodb]
+
+- name: Include authorization configuration
+  include: auth_initialization.yml
+  when: ( mongodb_security_authorization == 'enabled'
+          and not mongodb_replication_replset
+          and mongodb_user_admin_check.rc != 0 )
+  tags: [mongodb]
+
+- name: create normal users with replicaset
+  mongodb_user:
+    database: "{{ item.database }}"
+    name: "{{ item.name }}"
+    password: "{{ item.password }}"
+    update_password: "{{ mongodb_user_update_password }}"
+    roles: "{{ item.roles }}"
+    login_user: "{{ mongodb_user_admin_name }}"
+    login_password: "{{ mongodb_user_admin_password }}"
+    login_port: "{{ mongodb_login_port|default(27017) }}"
+    login_host: "{{ mongodb_login_host|default('localhost') }}"
+    ssl: "{{ True if mongodb_net_ssl_mode == 'requireSSL' else False }}"
+  with_items:
+    - "{{ mongodb_users | default([]) }}"
+  when: ( mongodb_replication_replset
+        and mongodb_security_authorization == 'enabled'
+        and mongodb_master is defined and mongodb_master )
+  no_log: true
+  tags: [mongodb]
+
+- name: create normal users without replicaset
+  mongodb_user:
+    database: "{{ item.database }}"
+    name: "{{ item.name }}"
+    password: "{{ item.password }}"
+    update_password: "{{ mongodb_user_update_password }}"
+    roles: "{{ item.roles }}"
+    login_user: "{{ mongodb_user_admin_name }}"
+    login_password: "{{ mongodb_user_admin_password }}"
+    login_port: "{{ mongodb_net_port }}"
+    login_host: "{{ mongodb_login_host|default('localhost') }}"
+    ssl: "{{ True if mongodb_net_ssl_mode == 'requireSSL' else False }}"
+  with_items:
+    - "{{ mongodb_users | default([]) }}"
+  when: ( mongodb_security_authorization == 'enabled'
+          and not mongodb_replication_replset )
+  no_log: true
+  ignore_errors: true
+  tags: [mongodb]
+
+- name: create oplog user with replicaset
+  mongodb_user:
+    database: admin
+    user: "{{ item.user }}"
+    password: "{{ item.password }}"
+    update_password: "{{ mongodb_user_update_password }}"
+    roles:
+      - db: local
+        role: read
+    login_user: "{{ mongodb_user_admin_name }}"
+    login_password: "{{ mongodb_user_admin_password }}"
+    login_port: "{{ mongodb_login_port|default(27017) }}"
+    login_host: "{{ mongodb_login_host|default('localhost') }}"
+    ssl: "{{ True if mongodb_net_ssl_mode == 'requireSSL' else False }}"
+  with_items:
+    - "{{ mongodb_oplog_users | default([]) }}"
+  when: ( mongodb_replication_replset | length > 0
+        and mongodb_security_authorization == 'enabled'
+        and mongodb_master is defined and mongodb_master )
+  no_log: true
+  tags: [mongodb]
+
+- name: service started
+  service:
+    name: "{{ mongodb_daemon_name }}"
+    state: started
+    enabled: yes
+
+- name: Include MMS Agent configuration
+  include: mms-agent.yml
+  when: mongodb_mms_api_key | length > 0
+  tags: [mongodb]
diff --git a/ansible/roles/mongodb-cluster/tasks/mms-agent.yml b/ansible/roles/mongodb-cluster/tasks/mms-agent.yml
new file mode 100644
index 000000000..84aba16ba
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/tasks/mms-agent.yml
@@ -0,0 +1,32 @@
+---
+- name: Install MMS agent (Debian)
+  apt:
+    deb: "{{ mongodb_mms_agent_pkg }}"
+  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+
+- name: Install MMS agent (RHEL)
+  yum:
+    name: "{{ mongodb_mms_agent_pkg }}"
+    state: present
+  when: ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat'
+
+- name: Configure the MMS agent pt. 1
+  file:
+    state: directory
+    path: /etc/mongodb-mms
+    owner: "{{ mongodb_user }}"
+    group: "{{ mongodb_user }}"
+    mode: 0755
+
+- name: Configure the MMS agent pt. 2
+  template:
+   src: monitoring-agent.config.j2
+   dest: /etc/mongodb-mms/monitoring-agent.config
+  notify: mongodb-mms-monitoring-agent restart
+
+- name: Ensure that the MMS agent is started
+  service:
+    name: mongodb-mms-monitoring-agent
+    state: started
+    enabled: yes
+
diff --git a/ansible/roles/mongodb-cluster/tasks/replication.yml b/ansible/roles/mongodb-cluster/tasks/replication.yml
new file mode 100644
index 000000000..3b5d106d1
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/tasks/replication.yml
@@ -0,0 +1,57 @@
+---
+
+- name: Replication configuration
+  mongodb_replication:
+    build_indexes: "{{ item.build_indexes|default(omit) }}"
+    login_host: "{{ mongodb_login_host|default('localhost') }}"
+    login_port: "{{ mongodb_login_port|default(27017) }}"
+    login_user: "{{ mongodb_root_admin_name }}"
+    login_password: "{{ mongodb_root_admin_password }}"
+    replica_set: "{{ mongodb_replication_replset }}"
+    host_name: "{{ host_name }}"
+    host_port: "{{ item.host_port|default(27017) }}"
+    host_type: "{{ item.host_type|default('replica') }}"
+    hidden: "{{ item.hidden|default(false) }}"
+    priority: "{{ item.priority|default(1.0) }}"
+    votes: "{{ item.votes|default(omit) }}"
+    ssl: "{{ True if mongodb_net_ssl_mode == 'requireSSL' else False }}"
+  when: mongodb_security_authorization == 'enabled'
+  with_items:
+    - "{{ mongodb_replication_params|default([]) }}"
+
+- name: Replication configuration without auth on master
+  mongodb_replication:
+    build_indexes: "{{ item.build_indexes|default(omit) }}"
+    login_host: "{{ mongodb_login_host|default('localhost') }}"
+    login_port: "{{ mongodb_login_port|default(27017) }}"
+    replica_set: "{{ mongodb_replication_replset }}"
+    host_name: "{{ host_name }}"
+    host_port: "{{ item.host_port|default(27017) }}"
+    host_type: "{{ item.host_type|default('replica') }}"
+    hidden: "{{ item.hidden|default(false) }}"
+    priority: "{{ item.priority|default(1.0) }}"
+    votes: "{{ item.votes|default(omit) }}"
+    ssl: "{{ True if mongodb_net_ssl_mode == 'requireSSL' else False }}"
+  when: ( mongodb_security_authorization == 'disabled'
+        and mongodb_master is defined and mongodb_master )
+  with_items:
+    - "{{ mongodb_replication_params|default([]) }}"
+
+- name: Replication configuration without auth on replicas and arbiters
+  mongodb_replication:
+    build_indexes: "{{ item.build_indexes|default(omit) }}"
+    login_host: "{{ mongodb_login_host|default('localhost') }}"
+    login_port: "{{ mongodb_login_port|default(27017) }}"
+    replica_set: "{{ mongodb_replication_replset }}"
+    host_name: "{{ host_name }}"
+    host_port: "{{ item.host_port|default(27017) }}"
+    host_type: "{{ item.host_type|default('replica') }}"
+    hidden: "{{ item.hidden|default(false) }}"
+    priority: "{{ item.priority|default(1.0) }}"
+    votes: "{{ item.votes|default(omit) }}"
+    ssl: "{{ True if mongodb_net_ssl_mode == 'requireSSL' else False }}"
+  when: ( mongodb_security_authorization == 'disabled'
+        and ( mongodb_master is not defined or not mongodb_master) )
+  with_items:
+    - "{{ mongodb_replication_params|default([]) }}"
+
diff --git a/ansible/roles/mongodb-cluster/tasks/replication_init_auth.yml b/ansible/roles/mongodb-cluster/tasks/replication_init_auth.yml
new file mode 100644
index 000000000..359d5545e
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/tasks/replication_init_auth.yml
@@ -0,0 +1,42 @@
+---
+- name: Replication configuration | 1st Pt.
+  mongodb_replication:
+    build_indexes: "{{ item.build_indexes|default(omit) }}"
+    login_host: "{{ mongodb_login_host|default('localhost') }}"
+    login_port: "{{ mongodb_net_port|default(27017) }}"
+    login_user: "{{ mongodb_root_admin_name }}"
+    login_password: "{{ mongodb_root_admin_password }}"
+    replica_set: "{{ mongodb_replication_replset }}"
+    host_name: "{{ host_name }}"
+    host_port: "{{ item.host_port|default(27017) }}"
+    host_type: "{{ item.host_type|default('replica') }}"
+    hidden: "{{ item.hidden|default(false) }}"
+    priority: "{{ item.priority|default(1.0) }}"
+    votes: "{{ item.votes|default(omit) }}"
+    ssl: "{{ True if mongodb_net_ssl_mode == 'requireSSL' else False }}"
+  with_items:
+    - "{{ mongodb_replication_params|default([]) }}"
+  register: mongodb_replica_init
+  ignore_errors: true
+
+- include: auth_initialization.yml
+  when: mongodb_replica_init is failed
+
+- name: Replication configuration | 2nd Pt
+  mongodb_replication:
+    build_indexes: "{{ item.build_indexes|default(omit) }}"
+    login_host: "{{ mongodb_login_host|default('localhost') }}"
+    login_port: "{{ mongodb_net_port|default(27017) }}"
+    login_user: "{{ mongodb_root_admin_name }}"
+    login_password: "{{ mongodb_root_admin_password }}"
+    replica_set: "{{ mongodb_replication_replset }}"
+    host_name: "{{ host_name }}"
+    host_port: "{{ item.host_port|default(27017) }}"
+    host_type: "{{ item.host_type|default('replica') }}"
+    hidden: "{{ item.hidden|default(false) }}"
+    priority: "{{ item.priority|default(1.0) }}"
+    votes: "{{ item.votes|default(omit) }}"
+    ssl: "{{ True if mongodb_net_ssl_mode == 'requireSSL' else False }}"
+  when: mongodb_replica_init is failed
+  with_items:
+    - "{{ mongodb_replication_params|default([]) }}"
diff --git a/ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.amazon.service.j2 b/ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.amazon.service.j2
new file mode 100644
index 000000000..d728e1567
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.amazon.service.j2
@@ -0,0 +1,17 @@
+# {{ ansible_managed }}
+[Unit]
+Description="Disable Transparent Hugepage before MongoDB boots"
+#WARN: check service name on your system
+# If you are using MongoDB Cloud, service name is "mongodb-mms-automation-agent.service"
+Before={{ mongodb_daemon_name }}.service
+
+[Service]
+Type=oneshot
+ExecStart=-/bin/bash -c 'echo never > /sys/kernel/mm/redhat_transparent_hugepage/enabled'
+ExecStart=-/bin/bash -c 'echo never > /sys/kernel/mm/redhat_transparent_hugepage/defrag'
+ExecStart=-/bin/bash -c 'echo 0 > /sys/kernel/mm/redhat_transparent_hugepage/khugepaged/defrag'
+
+[Install]
+#WARN: check service name on your system
+# If you are using MongoDB Cloud, service name is "mongodb-mms-automation-agent.service"
+RequiredBy={{ mongodb_daemon_name }}.service
diff --git a/ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.debian.service.j2 b/ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.debian.service.j2
new file mode 100644
index 000000000..b940261da
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.debian.service.j2
@@ -0,0 +1,17 @@
+# {{ ansible_managed }}
+[Unit]
+Description="Disable Transparent Hugepage before MongoDB boots"
+#WARN: check service name on your system
+# If you are using MongoDB Cloud, service name is "mongodb-mms-automation-agent.service"
+Before={{ mongodb_daemon_name }}.service
+
+[Service]
+Type=oneshot
+ExecStart=-/bin/bash -c 'echo never > /sys/kernel/mm/transparent_hugepage/enabled'
+ExecStart=-/bin/bash -c 'echo never > /sys/kernel/mm/transparent_hugepage/defrag'
+ExecStart=-/bin/bash -c 'echo 0 > /sys/kernel/mm/transparent_hugepage/khugepaged/defrag'
+
+[Install]
+#WARN: check service name on your system
+# If you are using MongoDB Cloud, service name is "mongodb-mms-automation-agent.service"
+RequiredBy={{ mongodb_daemon_name }}.service
diff --git a/ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.redhat.service.j2 b/ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.redhat.service.j2
new file mode 100644
index 000000000..d728e1567
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/templates/disable-transparent-hugepages.redhat.service.j2
@@ -0,0 +1,17 @@
+# {{ ansible_managed }}
+[Unit]
+Description="Disable Transparent Hugepage before MongoDB boots"
+#WARN: check service name on your system
+# If you are using MongoDB Cloud, service name is "mongodb-mms-automation-agent.service"
+Before={{ mongodb_daemon_name }}.service
+
+[Service]
+Type=oneshot
+ExecStart=-/bin/bash -c 'echo never > /sys/kernel/mm/redhat_transparent_hugepage/enabled'
+ExecStart=-/bin/bash -c 'echo never > /sys/kernel/mm/redhat_transparent_hugepage/defrag'
+ExecStart=-/bin/bash -c 'echo 0 > /sys/kernel/mm/redhat_transparent_hugepage/khugepaged/defrag'
+
+[Install]
+#WARN: check service name on your system
+# If you are using MongoDB Cloud, service name is "mongodb-mms-automation-agent.service"
+RequiredBy={{ mongodb_daemon_name }}.service
diff --git a/ansible/roles/mongodb-cluster/templates/mongod.conf.j2 b/ansible/roles/mongodb-cluster/templates/mongod.conf.j2
new file mode 100644
index 000000000..ebdead935
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/templates/mongod.conf.j2
@@ -0,0 +1,118 @@
+# {{ ansible_managed }}
+
+net:
+  bindIp: {{ mongodb_net_bindip }}
+  {% if mongodb_major_version is version("3.6", "<") -%}
+  http:
+    enabled: {{ mongodb_net_http_enabled | to_nice_json }}
+  {% endif -%}
+  ipv6: {{ mongodb_net_ipv6 | to_nice_json }}
+  maxIncomingConnections: {{ mongodb_net_maxconns }}
+  port: {{ mongodb_net_port }}
+  {% if mongodb_net_ssl_pemfile is defined and mongodb_net_ssl_mode is defined and mongodb_net_ssl == 'enabled' -%}
+  ssl:
+    mode: {{ mongodb_net_ssl_mode }}
+    PEMKeyFile: {{ mongodb_net_ssl_pemfile }}
+  {%- endif %}
+  {%- if mongodb_config['net'] is defined and mongodb_config['net'] is iterable %}
+  {%- for item in mongodb_config['net'] -%}
+  {{ item }}
+  {% endfor %}
+  {% endif %}
+
+processManagement:
+  fork: false
+
+{% if mongodb_replication_replset -%}
+replication:
+  oplogSizeMB: {{ mongodb_replication_oplogsize | int }}
+  replSetName: {{ mongodb_replication_replset }}
+  {% if mongodb_storage_engine == 'mmapv1' -%}
+  secondaryIndexPrefetch: {{ mongodb_replication_replindexprefetch }}
+  {%- endif %}
+  {%- if mongodb_config['replication'] is defined and mongodb_config['replication'] is iterable %}
+  {%- for item in mongodb_config['replication'] -%}
+  {{ item }}
+  {% endfor %}
+  {% endif %}
+{% endif %}
+
+security:
+  authorization: {{ mongodb_security_authorization }}
+  {% if mongodb_replication_replset and mongodb_security_authorization == 'enabled' -%}
+  keyFile: {{ mongodb_security_keyfile }}
+  {% endif -%}
+  javascriptEnabled: {{ mongodb_security_javascript_enabled | to_nice_json }}
+  {%- if mongodb_config['security'] is defined and mongodb_config['security'] is iterable %}
+  {%- for item in mongodb_config['security'] -%}
+  {{ item }}
+  {% endfor %}
+  {% endif %}
+
+storage:
+  dbPath: {{ mongodb_storage_dbpath }}
+  directoryPerDB: {{ mongodb_storage_dirperdb | to_nice_json }}
+  engine: {{ mongodb_storage_engine }}
+  journal:
+    enabled: {{ mongodb_storage_journal_enabled | to_nice_json }}
+  {% if mongodb_storage_engine == 'mmapv1' -%}
+  mmapv1:
+    quota:
+      enforced: {{ mongodb_storage_quota_enforced | to_nice_json }}
+      maxFilesPerDB: {{ mongodb_storage_quota_maxfiles }}
+    smallFiles: {{ mongodb_storage_smallfiles | to_nice_json }}
+  {% endif -%}
+  {% if mongodb_storage_engine == 'wiredTiger' -%}
+  wiredTiger:
+    engineConfig:
+      {% if mongodb_wiredtiger_cache_size is defined -%}
+      cacheSizeGB: {{ mongodb_wiredtiger_cache_size }}
+      {% endif -%}
+      directoryForIndexes: {{ mongodb_wiredtiger_directory_for_indexes | to_nice_json }}
+  {%- endif %}
+  {%- if mongodb_config['storage'] is defined and mongodb_config['storage'] is iterable %}
+  {%- for item in mongodb_config['storage'] -%}
+  {{ item }}
+  {% endfor %}
+  {% endif %}
+
+systemLog:
+  destination: {{ mongodb_systemlog_destination }}
+  {% if mongodb_systemlog_destination == 'file' -%}
+  logAppend: {{ mongodb_systemlog_logappend | to_nice_json }}
+  logRotate: {{ mongodb_systemlog_logrotate }}
+  path: {{ mongodb_systemlog_path }}
+  {%- endif %}
+  {%- if mongodb_config['systemLog'] is defined and mongodb_config['systemLog'] is iterable %}
+  {%- for item in mongodb_config['systemLog'] -%}
+  {{ item }}
+  {% endfor %}
+  {% endif %}
+
+operationProfiling:
+  slowOpThresholdMs: {{ mongodb_operation_profiling_slow_op_threshold_ms }}
+  mode: {{ mongodb_operation_profiling_mode }}
+  {%- if mongodb_config['operationProfiling'] is defined and mongodb_config['operationProfiling'] is iterable %}
+  {%- for item in mongodb_config['operationProfiling'] -%}
+  {{ item }}
+  {% endfor %}
+  {% endif %}
+
+{% if mongodb_major_version is version("4.0", ">=") -%}
+cloud:
+  monitoring:
+    free:
+      state: {{ mongodb_cloud_monitoring_free_state }}
+  {%- if mongodb_config['cloud'] is defined and mongodb_config['cloud'] is iterable %}
+  {%- for item in mongodb_config['cloud'] -%}
+  {{ item }}
+  {% endfor %}
+  {% endif %}
+{% endif %}
+
+{% if mongodb_set_parameters -%}
+setParameter:
+  {% for key, value in mongodb_set_parameters.items() -%}
+  {{ key }}: {{ value }}
+  {% endfor %}
+{% endif %}
diff --git a/ansible/roles/mongodb-cluster/templates/mongod_init.conf.j2 b/ansible/roles/mongodb-cluster/templates/mongod_init.conf.j2
new file mode 100644
index 000000000..7d279d01a
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/templates/mongod_init.conf.j2
@@ -0,0 +1,47 @@
+# {{ ansible_managed }}
+
+net:
+  bindIp: '127.0.0.1'
+  {% if mongodb_major_version is version("3.6", "<") -%}
+  http:
+    enabled: {{ mongodb_net_http_enabled | to_nice_json }}
+  {% endif -%}
+  ipv6: {{ mongodb_net_ipv6 | to_nice_json }}
+  maxIncomingConnections: {{ mongodb_net_maxconns }}
+  port: {{ mongodb_net_port }}
+
+processManagement:
+  fork: false 
+
+security:
+  authorization: 'disabled'
+
+storage:
+  dbPath: {{ mongodb_storage_dbpath }}
+  directoryPerDB: {{ mongodb_storage_dirperdb | to_nice_json }}
+  engine: {{ mongodb_storage_engine }}
+  journal:
+    enabled: {{ mongodb_storage_journal_enabled | to_nice_json }}
+  {% if mongodb_storage_engine == 'mmapv1' -%}
+  mmapv1:
+    quota:
+      enforced: {{ mongodb_storage_quota_enforced | to_nice_json }}
+      maxFilesPerDB: {{ mongodb_storage_quota_maxfiles }}
+    smallFiles: {{ mongodb_storage_smallfiles | to_nice_json }}
+  {% endif -%}
+  {% if mongodb_storage_engine == 'wiredTiger' -%}
+  wiredTiger:
+    engineConfig:
+      {% if mongodb_wiredtiger_cache_size is defined -%}
+      cacheSizeGB: {{ mongodb_wiredtiger_cache_size }}
+      {% endif -%}
+      directoryForIndexes: {{ mongodb_wiredtiger_directory_for_indexes | to_nice_json }}
+  {% endif %}
+
+systemLog:
+  destination: {{ mongodb_systemlog_destination }}
+  {% if mongodb_systemlog_destination == 'file' -%}
+  logAppend: {{ mongodb_systemlog_logappend | to_nice_json }}
+  logRotate: {{ mongodb_systemlog_logrotate }}
+  path: {{ mongodb_systemlog_path }}
+  {% endif -%}
diff --git a/ansible/roles/mongodb-cluster/templates/mongodb.repo.j2 b/ansible/roles/mongodb-cluster/templates/mongodb.repo.j2
new file mode 100644
index 000000000..727f2cb1b
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/templates/mongodb.repo.j2
@@ -0,0 +1,10 @@
+[mongodb-org-{{ mongodb_major_version }}]
+name=MongoDB {{ mongodb_major_version }} Repository
+baseurl={{ mongodb_repository[version_item] }}
+{% if mongodb_repository_gpgkey[version_item] is defined and mongodb_repository_gpgkey[version_item] != '' %}
+gpgcheck=1
+gpgkey={{ mongodb_repository_gpgkey[version_item] }}
+{% else %}
+gpgcheck=0
+{% endif %}
+enabled=1
diff --git a/ansible/roles/mongodb-cluster/templates/mongodb.service.j2 b/ansible/roles/mongodb-cluster/templates/mongodb.service.j2
new file mode 100644
index 000000000..61eb82c4c
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/templates/mongodb.service.j2
@@ -0,0 +1,34 @@
+# {{ ansible_managed }}
+[Unit]
+Description=An object/document-oriented database
+Documentation=man:mongod(1)
+After=network-online.target
+
+[Service]
+User={{ mongodb_user }}
+{% if mongodb_use_numa | bool %}
+ExecStart=/usr/bin/numactl --interleave=all /usr/bin/mongod --config /etc/mongod.conf
+{% else %}
+ExecStart=/usr/bin/mongod --config /etc/mongod.conf
+{% endif %}
+# file size
+LimitFSIZE=infinity
+# cpu time
+LimitCPU=infinity
+# virtual memory size
+LimitAS=infinity
+# open files
+LimitNOFILE={{ mongodb_systemd_unit_limit_nofile }}
+# processes/threads
+LimitNPROC={{ mongodb_systemd_unit_limit_nproc }}
+# locked memory
+LimitMEMLOCK=infinity
+# total threads (user+kernel)
+TasksMax=infinity
+TasksAccounting=false
+
+# Recommended limits for for mongod as specified in
+# http://docs.mongodb.org/manual/reference/ulimit/#recommended-settings
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ansible/roles/mongodb-cluster/templates/monitoring-agent.config.j2 b/ansible/roles/mongodb-cluster/templates/monitoring-agent.config.j2
new file mode 100644
index 000000000..2a50d10f4
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/templates/monitoring-agent.config.j2
@@ -0,0 +1,3 @@
+mmsApiKey={{ mongodb_mms_api_key }}
+mmsBaseUrl={{ mongodb_mms_base_url }}
+mmsGroupId={{ mongodb_mms_group_id }}
diff --git a/ansible/roles/mongodb-cluster/vars/Amazon.yml b/ansible/roles/mongodb-cluster/vars/Amazon.yml
new file mode 100644
index 000000000..1ad42a267
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/vars/Amazon.yml
@@ -0,0 +1,15 @@
+---
+mongodb_repository:
+  "4.2": "https://repo.mongodb.org/yum/amazon/2/mongodb-org/4.2/x86_64/"
+  "4.0": "https://repo.mongodb.org/yum/amazon/2/mongodb-org/4.0/x86_64/"
+  "3.6": "https://repo.mongodb.org/yum/amazon/2013.03/mongodb-org/3.6/x86_64/"
+  "3.4": "https://repo.mongodb.org/yum/amazon/2013.03/mongodb-org/3.4/x86_64/"
+
+mongodb_repository_gpgkey:
+  "4.2": "https://www.mongodb.org/static/pgp/server-4.2.asc"
+  "4.0": "https://www.mongodb.org/static/pgp/server-4.0.asc"
+  "3.6": "https://www.mongodb.org/static/pgp/server-3.6.asc"
+
+mongodb_pidfile_path: "{{ '/var/run/mongodb/mongod.pid' if ('mongodb-org' in mongodb_package) else '' }}"
+
+yum_lock_timeout: 180
diff --git a/ansible/roles/mongodb-cluster/vars/Debian.yml b/ansible/roles/mongodb-cluster/vars/Debian.yml
new file mode 100644
index 000000000..c4a956d0b
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/vars/Debian.yml
@@ -0,0 +1,6 @@
+---
+mongodb_repository:
+  "3.4": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/3.4 main"
+  "3.6": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/3.6 main"
+  "4.0": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/4.0 main"
+  "4.2": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/4.2 main"
diff --git a/ansible/roles/mongodb-cluster/vars/RedHat.yml b/ansible/roles/mongodb-cluster/vars/RedHat.yml
new file mode 100644
index 000000000..d04db94e3
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/vars/RedHat.yml
@@ -0,0 +1,16 @@
+---
+mongodb_repository:
+  "3.4": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.4/$basearch/"
+  "3.6": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.6/$basearch/"
+  "4.0": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.0/$basearch/"
+  "4.2": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.2/$basearch/"
+
+mongodb_repository_gpgkey:
+  "3.4": "https://www.mongodb.org/static/pgp/server-3.4.asc"
+  "3.6": "https://www.mongodb.org/static/pgp/server-3.6.asc"
+  "4.0": "https://www.mongodb.org/static/pgp/server-4.0.asc"
+  "4.2": "https://www.mongodb.org/static/pgp/server-4.2.asc"
+
+mongodb_pidfile_path: "{{ '/var/run/mongodb/mongod.pid' if ('mongodb-org' in mongodb_package) else '' }}"
+
+yum_lock_timeout: 180
diff --git a/ansible/roles/mongodb-cluster/vars/Ubuntu.yml b/ansible/roles/mongodb-cluster/vars/Ubuntu.yml
new file mode 100644
index 000000000..1054614c7
--- /dev/null
+++ b/ansible/roles/mongodb-cluster/vars/Ubuntu.yml
@@ -0,0 +1,6 @@
+---
+mongodb_repository:
+  "3.4": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.4 multiverse"
+  "3.6": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.6 multiverse"
+  "4.0": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.0 multiverse"
+  "4.2": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.2 multiverse"
diff --git a/pipelines/provision/mongodb-cluster/Jenkinsfile b/pipelines/provision/mongodb-cluster/Jenkinsfile
new file mode 100644
index 000000000..5485868e0
--- /dev/null
+++ b/pipelines/provision/mongodb-cluster/Jenkinsfile
@@ -0,0 +1,51 @@
+@Library('deploy-conf') _
+node() {
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        stage('checkout public repo') {
+            folder = new File("$WORKSPACE/.git")
+            if (folder.exists())
+            {
+               println "Found .git folder. Clearing it.."
+               sh'git clean -fxd'
+            }
+            checkout scm
+        }
+
+        ansiColor('xterm') {
+            stage('deploy'){
+                values = [:]
+                currentWs = sh(returnStdout: true, script: 'pwd').trim()
+                envDir = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-3].trim()
+                module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim()
+                jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
+                ansiblePlaybook = "${currentWs}/ansible/mongodb-cluster.yml"
+                ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass -v"
+                values.put('currentWs', currentWs)
+                values.put('env', envDir)
+                values.put('module', module)
+                values.put('jobName', jobName)
+                values.put('ansiblePlaybook', ansiblePlaybook)
+                values.put('ansibleExtraArgs', ansibleExtraArgs)
+                println values
+                ansible_playbook_run(values)
+                currentBuild.result = 'SUCCESS'
+                currentBuild.description = "Private: ${params.private_branch}, Public: ${params.branch_or_tag}"
+            }
+        }
+         summary()
+     }
+    catch (err) {
+        currentBuild.result = 'FAILURE'
+        throw err
+    }    
+    finally {
+        slack_notify(currentBuild.result)
+        email_notify()
+    }
+} 

From 4d254caab6adfbfe51f23a68e92d7be071e1fe7e Mon Sep 17 00:00:00 2001
From: Rhea Fernandes <32357913+rheafernandes@users.noreply.github.com>
Date: Tue, 1 Dec 2020 19:25:15 +0530
Subject: [PATCH 050/184] Sc 1928 (#2064)

* Added changes to handle object definition in questions

* Added change to ItemSet Module
---
 .../stack-sunbird/templates/assessment-service_application.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
index 047221b7c..5fbc0d35a 100644
--- a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
@@ -107,7 +107,7 @@ play.modules {
 
   # If there are any built-in modules that you want to disable, you can list them here.
   #disabled += ""
-  enabled += modules.ItemSetModule
+  enabled += modules.AssessmentModule
 }
 
 ## IDE

From ba7300f8d2056212465e102bdb22e5256b0dfdd5 Mon Sep 17 00:00:00 2001
From: Harsha <harshavardhanc95@gmail.com>
Date: Wed, 2 Dec 2020 19:02:30 +0530
Subject: [PATCH 051/184] jenkinsfile and ansible playbook for nodebb UI
 deployment (#2068)

* jenkinsfile and ansible playbook for nodebb UI deployment
---
 ansible/nodebbui-upload.yml           | 19 +++++++++
 pipelines/deploy/NodebbUI/Jenkinsfile | 58 +++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 ansible/nodebbui-upload.yml
 create mode 100644 pipelines/deploy/NodebbUI/Jenkinsfile

diff --git a/ansible/nodebbui-upload.yml b/ansible/nodebbui-upload.yml
new file mode 100644
index 000000000..92b484a58
--- /dev/null
+++ b/ansible/nodebbui-upload.yml
@@ -0,0 +1,19 @@
+- hosts: local
+  become: yes
+  gather_facts: no
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  environment:
+        AZURE_STORAGE_ACCOUNT: "{{ sunbird_public_storage_account_name }}"
+        AZURE_STORAGE_SAS_TOKEN: "{{ sunbird_public_storage_account_sas  }}"
+  tasks:
+    - name: delete batch
+      shell: |
+        azcopy rm "https://{{ sunbird_public_storage_account_name }}.blob.core.windows.net/{{ nodebbui_container_name }}{{sunbird_public_storage_account_sas}}" --recursive=true
+      async: 3600
+      poll: 10
+
+    - name: upload batch
+      command: "az storage blob upload-batch --destination {{ nodebbui_container_name }} --source {{ source_name }}"
+      async: 3600
+      poll: 10
diff --git a/pipelines/deploy/NodebbUI/Jenkinsfile b/pipelines/deploy/NodebbUI/Jenkinsfile
new file mode 100644
index 000000000..150a57f44
--- /dev/null
+++ b/pipelines/deploy/NodebbUI/Jenkinsfile
@@ -0,0 +1,58 @@
+@Library('deploy-conf') _
+node() {
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        stage('checkout public repo') {
+            folder = new File("$WORKSPACE/.git")
+            if (folder.exists())
+            {
+               println "Found .git folder. Clearing it.."
+               sh'git clean -fxd'
+            }
+            checkout scm
+        }
+
+            ansiColor('xterm') {
+                values = lp_dp_params()
+                values.put('module', 'Core')
+                stage('get artifact') {
+                    currentWs = sh(returnStdout: true, script: 'pwd').trim()
+                    artifact = values.artifact_name + ":" + values.artifact_version
+                    values.put('currentWs', currentWs)
+                    values.put('artifact', artifact)
+                    artifact_download(values)
+                }
+                stage('deploy artifact'){
+                    sh """
+                       unzip -o ${artifact} -d discussion-ui
+                    """
+                    
+                    ansiblePlaybook = "${currentWs}/ansible/nodebbui-upload.yml"
+                    ansibleExtraArgs = "--extra-vars \"source_name=${currentWs}/discussion-ui\" --vault-password-file /var/lib/jenkins/secrets/vault-pass"  
+                    values.put('ansiblePlaybook', ansiblePlaybook)
+                    values.put('ansibleExtraArgs', ansibleExtraArgs)
+                    println values
+                    ansible_playbook_run(values)
+
+                    currentBuild.result = 'SUCCESS'
+                    archiveArtifacts artifacts: "${artifact}", fingerprint: true, onlyIfSuccessful: true
+                    archiveArtifacts artifacts: 'metadata.json', onlyIfSuccessful: true
+                    currentBuild.description = "Artifact: ${values.artifact_version}, Private: ${params.private_branch}, Public: ${params.branch_or_tag}"
+                }
+            }
+            summary()
+     }
+    catch (err) {
+        currentBuild.result = 'FAILURE'
+        throw err
+    }    
+    finally {
+        slack_notify(currentBuild.result)
+        email_notify()
+    }
+}

From d061da2d422dea4ff6210d7cf4864127a328e0ac Mon Sep 17 00:00:00 2001
From: Harsha <harshavardhanc95@gmail.com>
Date: Thu, 3 Dec 2020 11:48:53 +0530
Subject: [PATCH 052/184] mongodb changes for nodebb (#2069)

* mongodb changes for nodebb

* default value for mongodb host
---
 ansible/inventory/env/group_vars/all.yml                   | 1 +
 .../helm_charts/core/nodebb/templates/deployment.yaml      | 7 +++----
 kubernetes/helm_charts/core/nodebb/values.j2               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index 65eb1db11..3012f6009 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -649,3 +649,4 @@ group_activity_agg_cache_enable: false
 
 # nodebb variables
 sunbird_nodebb_storage_key: "{{ core_vault_sunbird_nodebb_storage_key }}"
+mongo_nodebb_host: "{{ groups['mongo'] | join ',' }}"
diff --git a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
index 10e4c3825..ef395da3a 100644
--- a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
@@ -60,14 +60,13 @@ data:
      {
          "url": "{{ .Values.nodebb_url }}",
          "secret": "100101",
-         "database": "redis",
+         "database": "mongo",
          "port": "4567",
          "redis": {
-             "host": "{{ .Values.redis_nodebb_host }}",
-             "port": 6379,
+             "host": "{{ .Values.mongo_nodebb_host }}",
+             "port": 27017,
              "username": "",
              "password": "",
-             "database": "0"
          }
      }
 
diff --git a/kubernetes/helm_charts/core/nodebb/values.j2 b/kubernetes/helm_charts/core/nodebb/values.j2
index b5cbc5fd9..1d7089ab1 100644
--- a/kubernetes/helm_charts/core/nodebb/values.j2
+++ b/kubernetes/helm_charts/core/nodebb/values.j2
@@ -24,4 +24,4 @@ strategy:
   maxunavailable: {{ nodebb_maxunavailable|default('25%') }}
 
 nodebb_url: {{ sunbird_nodebb_url }}
-redis_nodebb_host: {{ redis_nodebb_host }}
+mongo_nodebb_host: {{ mongo_nodebb_host }}

From 0fc16ac59133bfce6c13adb41c6ec807900a912d Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 3 Dec 2020 12:02:52 +0530
Subject: [PATCH 053/184] feat: TG-713 adding code to inject keys to portal
 (#2070)

* feat: TG-508 dependency for injecting access keys

* fix: updating player deployment file

* fix: add KC public mount to portal

* fix: updated secret name
---
 .../roles/deploy-player/tasks/main.yml        | 31 ++++++++++++++++
 .../core/player/templates/configmap.yaml      | 22 ++++++------
 .../core/player/templates/deployment.yaml     | 36 +++++++++++++------
 kubernetes/helm_charts/core/player/values.j2  |  2 ++
 4 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/kubernetes/ansible/roles/deploy-player/tasks/main.yml b/kubernetes/ansible/roles/deploy-player/tasks/main.yml
index fb4076534..5213285e5 100644
--- a/kubernetes/ansible/roles/deploy-player/tasks/main.yml
+++ b/kubernetes/ansible/roles/deploy-player/tasks/main.yml
@@ -32,9 +32,40 @@
 - name: create configmap
   shell: "kubectl create configmap player-config --from-env-file={{role_path}}/templates/{{ release_name }}.env -n {{namespace}} --dry-run -o=yaml | kubectl apply -f -"
 
+- name: Load role to decrypt private keys, copy to helm chart and encrypt private keys
+  include_role:
+    name: mount-keys
+    tasks_from: "{{outer_item.1}}"
+  vars:
+    private_key_path: "{{ outer_item.0.values_to_pass.basepath }}"
+    private_key_prefix: "{{ outer_item.0.values_to_pass.keyprefix }}"
+    private_key_sign_start: "{{ outer_item.0.values_to_pass.keystart }}"
+    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '0'  }}"
+  when: release_name == "player"
+  with_subelements:
+    - "{{adminutil_access_values}}"
+    - role_to_run
+  loop_control:
+    loop_var: outer_item
+
+- name: Create the token pubic key file
+  copy:
+    dest: "{{ chart_path }}/keys/{{ adminutil_refresh_token_public_key_kid }}"
+    content: "{{ core_vault_sunbird_sso_publickey }}"
+  when: release_name == "player"
+
 - name: helm install and upgrade
   shell: helm upgrade --install --atomic --timeout 10m {{ release_name }} {{ chart_path }} -n {{namespace}}
 
+- name: Clean up keys
+  include_role:
+    name: mount-keys
+    tasks_from: "{{item}}"
+  when: release_name == "player"
+  with_items:
+    - remove-from-helm.yml
+    - remove-keys-from-inventory.yml
+
 - name: Get the deployment rollout status
   shell: "kubectl get deployments -A | grep -i {{ release_name }} | awk -F' ' '{print $3}' | awk -F/ '{if ($1 ~ $2){exit 0} else {exit 1}}'"
   register: task_result
diff --git a/kubernetes/helm_charts/core/player/templates/configmap.yaml b/kubernetes/helm_charts/core/player/templates/configmap.yaml
index 557247253..37553c79c 100644
--- a/kubernetes/helm_charts/core/player/templates/configmap.yaml
+++ b/kubernetes/helm_charts/core/player/templates/configmap.yaml
@@ -1,11 +1,11 @@
-#apiVersion: v1
-#data:
-#  {{- range $key, $val := .Values.playerenv }}
-#  {{ $key }}: {{ default "''" $val }}
-#  {{- end }}
-#  sunbird_cassandra_replication_strategy: {{ .Values.sunbird_cassandra_replication_strategy | toJson }}
-#kind: ConfigMap
-#metadata:
-#  creationTimestamp: null
-#  name: {{ .Chart.Name }}-config
-#  namespace: {{ .Values.namespace }}
+---
+{{- $keys := .Files.Glob "keys/*" }}
+{{ if $keys }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: player-access-keys
+type: Opaque
+data:
+{{ (.Files.Glob "keys/*").AsSecrets | indent 2 }}
+{{ end }}
diff --git a/kubernetes/helm_charts/core/player/templates/deployment.yaml b/kubernetes/helm_charts/core/player/templates/deployment.yaml
index e83cd8204..642ecf275 100644
--- a/kubernetes/helm_charts/core/player/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/player/templates/deployment.yaml
@@ -24,12 +24,6 @@ spec:
       imagePullSecrets:
       - name: {{ .Values.imagepullsecrets }}
 {{- end }}
-      {{- if .Values.sunbird_portal_player_cdn_enabled }}
-      volumes:
-        - name: player-cdn-config
-          configMap:
-            name: player-cdn-config
-      {{- end }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
@@ -46,14 +40,36 @@ spec:
 {{ toYaml .Values.livenessProbe | indent 10 }}
         readinessProbe:
 {{ toYaml .Values.readinessProbe | indent 10 }}
-        {{- end }}
-        {{- if .Values.sunbird_portal_player_cdn_enabled }}
+{{- end }}
+{{- $keys := .Files.Glob "keys/*" }}
+{{- if or  .Values.sunbird_portal_player_cdn_enabled $keys }}
         volumeMounts:
+{{- end }}
+{{- if .Values.sunbird_portal_player_cdn_enabled }}
           - name: player-cdn-config
             mountPath: /home/sunbird/app_dist/dist/index_cdn.ejs
             subPath: index_cdn.ejs
-        {{- end }}
-
+{{- end }}
+{{- $keys := .Files.Glob "keys/*" }}
+{{- if $keys }}
+          - mountPath: {{ .Values.player_access_basepath }}
+            name: access-keys
+{{- end }}
+{{- $keys := .Files.Glob "keys/*" }}
+{{- if or  .Values.sunbird_portal_player_cdn_enabled $keys }}
+      volumes:
+{{- end }}
+{{- if .Values.sunbird_portal_player_cdn_enabled }}
+      - name: player-cdn-config
+        configMap:
+          name: player-cdn-config
+{{- end }}
+{{- $keys := .Files.Glob "keys/*" }}
+{{- if $keys }}
+      - name: access-keys
+        secret:
+          secretName: player-access-keys
+{{- end }}
 ---
 apiVersion: v1
 kind: Service
diff --git a/kubernetes/helm_charts/core/player/values.j2 b/kubernetes/helm_charts/core/player/values.j2
index 7f83b5b08..c21f6302b 100644
--- a/kubernetes/helm_charts/core/player/values.j2
+++ b/kubernetes/helm_charts/core/player/values.j2
@@ -25,3 +25,5 @@ strategy:
 sunbird_portal_player_cdn_enabled: {{sunbird_portal_player_cdn_enabled|lower}}
 
 {{ player_liveness_readiness | to_nice_yaml }}
+
+player_access_basepath: {{ player_access_basepath | default('/home/sunbird/app_dist/keys/') }}

From d52b244a38d39649bed039a2edfddae0cf1aa6b6 Mon Sep 17 00:00:00 2001
From: Rhea Fernandes <32357913+rheafernandes@users.noreply.github.com>
Date: Thu, 3 Dec 2020 15:21:19 +0530
Subject: [PATCH 054/184] SC-1928 Onboarded Question and Question Set APIs
 (#2065)

* SC-1928 Onboarded Question and Question Set APIs

* Added ingress configuration

* Added changes to handle external data

* Added changes to handle external data

* Onboarded update hierarchy api's

* Added expected changes
---
 ansible/roles/kong-api/defaults/main.yml      | 255 ++++++++++++++++++
 .../assessment-service_application.conf       |   4 +-
 2 files changed, 258 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 1c01c239f..4a365fed3 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -76,6 +76,8 @@ object_category_definition_prefix: /object/category/definition
 dataset_service_prefix: /dataset
 asset_prefix: /asset
 collection_prefix: /collection
+question_prefix: /question
+questionset_prefix: /questionset
 
 
 # Service URLs
@@ -95,6 +97,7 @@ report_service_url: "http://report-service:3030"
 group_service_url: "http://groups-service:9000"
 analytics_api_service_url: "http://analytics-service:9000"
 taxonomy_service_url: "http://taxonomy-service:9000"
+assessment_service_url: "http://assessment-service:9000"
 
 premium_consumer_rate_limits:
   - api: createContent
@@ -5692,3 +5695,255 @@ kong_apis:
       config.limit_by: credential
     - name: request-size-limiting
       config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionCreate
+    uris: "{{ question_prefix }}/v1/create"
+    upstream_url: "{{ assessment_service_url }}/question/v4/create"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentCreate'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionRead
+    uris: "{{ question_prefix }}/v1/read"
+    upstream_url: "{{ assessment_service_url }}/question/v4/read"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionUpdate
+    uris: "{{ question_prefix }}/v1/update"
+    upstream_url: "{{ assessment_service_url }}/question/v4/update"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentUpdate'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionRetire
+    uris: "{{ question_prefix }}/v1/retire"
+    upstream_url: "{{ assessment_service_url }}/question/v4/retire"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAdmin'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionReview
+    uris: "{{ question_prefix }}/v1/review"
+    upstream_url: "{{ assessment_service_url }}/question/v4/review"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAdmin'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionPublish
+    uris: "{{ question_prefix }}/v1/publish"
+    upstream_url: "{{ assessment_service_url }}/question/v4/publish"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentCreate'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionSetCreate
+    uris: "{{ questionset_prefix }}/v1/create"
+    upstream_url: "{{ assessment_service_url }}/questionset/v4/create"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentCreate'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionSetRead
+    uris: "{{ questionset_prefix }}/v1/read"
+    upstream_url: "{{ assessment_service_url }}/questionset/v4/read"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionSetUpdate
+    uris: "{{ questionset_prefix }}/v1/update"
+    upstream_url: "{{ assessment_service_url }}/questionset/v4/update"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentUpdate'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionSetRetire
+    uris: "{{ questionset_prefix }}/v1/retire"
+    upstream_url: "{{ assessment_service_url }}/questionset/v4/retire"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAdmin'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionSetReview
+    uris: "{{ questionset_prefix }}/v1/review"
+    upstream_url: "{{ assessment_service_url }}/questionset/v4/review"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAdmin'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionSetPublish
+    uris: "{{ questionset_prefix }}/v1/publish"
+    upstream_url: "{{ assessment_service_url }}/questionset/v4/publish"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAdmin'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionSetUpdateHierarchy
+    uris: "{{ questionset_prefix }}/v1/hierarchy/update"
+    upstream_url: "{{ assessment_service_url }}/questionset/v4/hierarchy/update"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentUpdate'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionSetReadHierarchy
+    uris: "{{ questionset_prefix }}/v1/hierarchy"
+    upstream_url: "{{ assessment_service_url }}/questionset/v4/hierarchy"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
\ No newline at end of file
diff --git a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
index 5fbc0d35a..16e226d91 100644
--- a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
@@ -376,4 +376,6 @@ kafka {
   topic.send.enable : true
   topics.instruction : "{{ env_name }}.learning.job.request"
 }
-objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_store"
\ No newline at end of file
+objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_store"
+question.keyspace="{{ lp_cassandra_keyspace_prefix }}_question_store"
+questionset.keyspace="{{ lp_cassandra_keyspace_prefix }}_hierarchy_store"
\ No newline at end of file

From ce06614ab843f6440c52dfe27d435ace656f6877 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Fri, 4 Dec 2020 04:18:41 +0000
Subject: [PATCH 055/184] Scripts to deploy discussionsmw service (#2063)

* Adding helm chart for discussionsmw

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Adding env file for discussionsmw

* fix: configmap and livenessProbe

* fix: typo

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 ansible/roles/stack-sunbird/defaults/main.yml | 43 ++++++++++----
 .../sunbird_discussions-mw-service.env        |  0
 .../core/discussionsmw/.helmignore            | 22 +++++++
 .../helm_charts/core/discussionsmw/Chart.yaml |  5 ++
 .../core/discussionsmw/templates/_helpers.tpl | 45 ++++++++++++++
 .../discussionsmw/templates/configmap.yaml    | 11 ++++
 .../discussionsmw/templates/deployment.yaml   | 59 +++++++++++++++++++
 .../helm_charts/core/discussionsmw/values.j2  | 25 ++++++++
 8 files changed, 199 insertions(+), 11 deletions(-)
 create mode 100644 ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
 create mode 100644 kubernetes/helm_charts/core/discussionsmw/.helmignore
 create mode 100644 kubernetes/helm_charts/core/discussionsmw/Chart.yaml
 create mode 100644 kubernetes/helm_charts/core/discussionsmw/templates/_helpers.tpl
 create mode 100644 kubernetes/helm_charts/core/discussionsmw/templates/configmap.yaml
 create mode 100644 kubernetes/helm_charts/core/discussionsmw/templates/deployment.yaml
 create mode 100644 kubernetes/helm_charts/core/discussionsmw/values.j2

diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml
index 37e8e3485..cd27fce92 100644
--- a/ansible/roles/stack-sunbird/defaults/main.yml
+++ b/ansible/roles/stack-sunbird/defaults/main.yml
@@ -147,7 +147,7 @@ max_kafka_message_size: "5242880"
 sunbird_gzip_enable: true
 sunbird_analytics_blob_account_name:
 sunbird_analytics_blob_account_key:
-sunbird_portal_player_cdn_enabled: 
+sunbird_portal_player_cdn_enabled:
 sunbird_portal_preview_cdn_url:
 cdn_file_path:
 sunbird_portal_cdn_blob_url:
@@ -211,7 +211,7 @@ proxy_replicas: 1
 proxy_reservation_memory: 32M
 proxy_limit_memory: 64M
 nginx_per_ip_connection_limit: 400
-merge_proxy_server_name: 
+merge_proxy_server_name:
 proxy_prometheus: false
 
 networks:
@@ -246,7 +246,7 @@ upstream_url: "ekstep-public-{{ekstep_s3_env}}.s3-ap-south-1.amazonaws.com"
 plugin_upstream_url: "ekstep-public-{{ekstep_s3_env}}.s3-ap-south-1.amazonaws.com"
 sunbird_offline_azure_storage_account_url: "{{ sunbird_public_storage_account_name }}.blob.core.windows.net/{{ offline_installer_container_name }}"
 # Override this dictionary in your common.yaml
-proxy:  
+proxy:
   # repository:  'proxy'
   # image_tag:  2.4.0
 
@@ -258,14 +258,14 @@ service_env:
   learner:
     - ../../../../ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
     - ../../../../ansible/roles/stack-sunbird/templates/learner-service_logback.xml
-  lms: 
+  lms:
     - ../../../../ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
     - ../../../../ansible/roles/stack-sunbird/templates/lms-service_logback.xml
   knowledgemw: ../../../../ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env
   apimanager: ../../../../ansible/roles/stack-api-manager/templates/api-manager.env
   cert: ../../../../ansible/roles/stack-sunbird/templates/sunbird_cert-service.env
   certregistry: ../../../../ansible/roles/stack-sunbird/templates/sunbird_cert-registry-service.env
-  content: 
+  content:
     - ../../../../ansible/roles/stack-sunbird/templates/content-service_application.conf
     - ../../../../ansible/roles/stack-sunbird/templates/content-service_logback.xml
   assessment:
@@ -277,18 +277,19 @@ service_env:
   userorg: ../../../../ansible/roles/stack-sunbird/templates/sunbird_user-org-service.env
   player: ../../../../ansible/roles/stack-sunbird/templates/sunbird_player.env
   print: ../../../../ansible/roles/stack-sunbird/templates/sunbird_print-service.env
-  search: 
+  search:
     - ../../../../ansible/roles/stack-sunbird/templates/search-service_application.conf
     - ../../../../ansible/roles/stack-sunbird/templates/search-service_logback.xml
-  taxonomy: 
+  taxonomy:
     - ../../../../ansible/roles/stack-sunbird/templates/taxonomy-service_application.conf
     - ../../../../ansible/roles/stack-sunbird/templates/taxonomy-service_logback.xml
   report: ../../../../ansible/roles/stack-sunbird/templates/sunbird_report-service.env
   telemetry-dp-logstash: ../../../../ansible/roles/stack-sunbird/templates/telemetry-logstash-datapipeline.conf
   nodebb: ../../../../ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
   analytics: ../../../../ansible/roles/stack-sunbird/templates/analytics_api_service.conf
+  discussionsmw: ../../../../ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
 
-sunbird_portal_player_cdn_enabled: false 
+sunbird_portal_player_cdn_enabled: false
 
 ########### stack-apimanager defaults vars ##### for kubernetes #########
 kong_database: postgres
@@ -381,7 +382,7 @@ assessment_liveness_readiness:
     failureThreshold: 5
 
 cert_liveness_readiness:
-  healthcheck: true 
+  healthcheck: true
   readinessProbe:
     httpGet:
       path: /service/health
@@ -541,7 +542,7 @@ player_liveness_readiness:
     failureThreshold: 5
 
 print_liveness_readiness:
-  healthcheck: true 
+  healthcheck: true
   readinessProbe:
     httpGet:
       path: /health
@@ -599,6 +600,26 @@ userorg_liveness_readiness:
     timeoutSeconds: 10
     failureThreshold: 5
 
+discussionsmw_liveness_readiness:
+  healthcheck: true
+  readinessProbe:
+    httpGet:
+      path: /health
+      port: 3002
+    initialDelaySeconds: 30
+    periodSeconds: 30
+    timeoutSeconds: 10
+    failureThreshold: 5
+    successThreshold: 2
+  livenessProbe:
+    httpGet:
+      path: /health
+      port: 3002
+    initialDelaySeconds: 30
+    periodSeconds: 30
+    timeoutSeconds: 10
+    failureThreshold: 5
+
 search_liveness_readiness:
   healthcheck: true
   readinessProbe:
@@ -751,7 +772,7 @@ report_config: "{{ env_name }}_report_config"
 job_request: "{{ env_name }}_job_request"
 experiment_definition: "{{ env_name }}_experiment_definition"
 
-#### Exhuats API consumer 
+#### Exhuats API consumer
 exhaust_api_consumer_ids: ["273f3b18-5dda-4a27-984a-060c7cd398d3"] # being used in analytics api to access the analytics exhaust api
 
 user_profile_read_url: "http://learner-service:9000/v1/user/read/" # being used in analytics api to get user details
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
new file mode 100644
index 000000000..e69de29bb
diff --git a/kubernetes/helm_charts/core/discussionsmw/.helmignore b/kubernetes/helm_charts/core/discussionsmw/.helmignore
new file mode 100644
index 000000000..50af03172
--- /dev/null
+++ b/kubernetes/helm_charts/core/discussionsmw/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/kubernetes/helm_charts/core/discussionsmw/Chart.yaml b/kubernetes/helm_charts/core/discussionsmw/Chart.yaml
new file mode 100644
index 000000000..bdb14d7af
--- /dev/null
+++ b/kubernetes/helm_charts/core/discussionsmw/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: discussionsmw
+version: 0.1.0
diff --git a/kubernetes/helm_charts/core/discussionsmw/templates/_helpers.tpl b/kubernetes/helm_charts/core/discussionsmw/templates/_helpers.tpl
new file mode 100644
index 000000000..4dda28416
--- /dev/null
+++ b/kubernetes/helm_charts/core/discussionsmw/templates/_helpers.tpl
@@ -0,0 +1,45 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "content.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "content.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "content.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "content.labels" -}}
+app.kubernetes.io/name: {{ include "content.name" . }}
+helm.sh/chart: {{ include "content.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
diff --git a/kubernetes/helm_charts/core/discussionsmw/templates/configmap.yaml b/kubernetes/helm_charts/core/discussionsmw/templates/configmap.yaml
new file mode 100644
index 000000000..e86595441
--- /dev/null
+++ b/kubernetes/helm_charts/core/discussionsmw/templates/configmap.yaml
@@ -0,0 +1,11 @@
+#apiVersion: v1
+#data:
+#  {{- range $key, $val := .Values.knowledgemwenv }}
+#  {{ $key }}: {{ $val }}
+#  {{- end }}
+#  sunbird_cassandra_replication_strategy: {{ .Values.sunbird_cassandra_replication_strategy | toJson }}
+#kind: ConfigMap
+#metadata:
+#  creationTimestamp: null
+#  name: {{ .Chart.Name }}-config
+#  namespace: {{ .Values.namespace }}
diff --git a/kubernetes/helm_charts/core/discussionsmw/templates/deployment.yaml b/kubernetes/helm_charts/core/discussionsmw/templates/deployment.yaml
new file mode 100644
index 000000000..7cfc8ef45
--- /dev/null
+++ b/kubernetes/helm_charts/core/discussionsmw/templates/deployment.yaml
@@ -0,0 +1,59 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+  annotations:
+    reloader.stakater.com/auto: "true"
+spec:
+  replicas: {{ .Values.replicaCount }}
+  strategy:
+     rollingUpdate:
+        maxSurge: {{ .Values.strategy.maxsurge }}
+        maxUnavailable: {{ .Values.strategy.maxunavailable }}
+  selector:
+    matchLabels:
+      app: {{ .Chart.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Chart.Name }}
+    spec:
+{{- if .Values.imagepullsecrets }}
+      imagePullSecrets:
+      - name: {{ .Values.imagepullsecrets }}
+{{- end }}
+      containers:
+      - name: {{ .Chart.Name }}
+        image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
+        imagePullPolicy: Always
+        envFrom:
+        - configMapRef:
+            name: discussionsmw-config
+        resources:
+{{ toYaml .Values.resources | indent 10 }}
+        ports:
+        - containerPort: {{ .Values.network.port }}
+        {{- if .Values.healthcheck }}
+        livenessProbe:
+{{ toYaml .Values.livenessProbe | indent 10 }}
+        readinessProbe:
+{{ toYaml .Values.readinessProbe | indent 10 }}
+        {{- end }}
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: disussionsmw-service
+  namespace: {{ .Values.namespace }}
+  labels:
+    app: {{ .Chart.Name }}
+spec:
+  ports:
+  - name: http-{{ .Chart.Name }}
+    protocol: TCP
+    port: {{ .Values.network.targetport }}
+  selector:
+    app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/discussionsmw/values.j2 b/kubernetes/helm_charts/core/discussionsmw/values.j2
new file mode 100644
index 000000000..220b22d58
--- /dev/null
+++ b/kubernetes/helm_charts/core/discussionsmw/values.j2
@@ -0,0 +1,25 @@
+### Default variable file for disussions_mw service ###
+
+namespace: {{ namespace }}
+imagepullsecrets: {{ imagepullsecrets }}
+dockerhub: {{ dockerhub }}
+
+replicaCount: {{disussions_mw_replicacount|default(1)}}
+repository: {{disussions_mw_repository|default('discussion-middleware')}}
+image_tag: {{ image_tag }}
+resources:
+  requests:
+    cpu: {{disussions_mw_cpu_req|default('100m')}}
+    memory: {{disussions_mw_mem_req|default('100Mi')}}
+  limits:
+    cpu: {{disussions_mw_cpu_limit|default('1')}}
+    memory: {{disussions_mw_mem_limit|default('1024Mi')}}
+network:
+  port: 3002
+  targetport: 3002
+strategy:
+  type: RollingUpdate
+  maxsurge: {{ disussions_mw_maxsurge|default('25%') }}
+  maxunavailable: {{ disussions_mw_maxunavailable|default('25%') }}
+
+{{ discussionsmw_liveness_readiness | to_nice_yaml }}

From 87f27689dbd086e5256e7c7075369338f982d423 Mon Sep 17 00:00:00 2001
From: Rajeev Sathish <rajeev.sathish@tarento.com>
Date: Fri, 4 Dec 2020 17:12:45 +0530
Subject: [PATCH 056/184] Issue #SB-21908 language changes (#2072)

---
 utils/portal/labels/all_labels_as.json | 1 +
 utils/portal/labels/all_labels_bn.json | 1 +
 utils/portal/labels/all_labels_en.json | 1 +
 utils/portal/labels/all_labels_gu.json | 1 +
 utils/portal/labels/all_labels_hi.json | 1 +
 utils/portal/labels/all_labels_kn.json | 1 +
 utils/portal/labels/all_labels_ml.json | 1 +
 utils/portal/labels/all_labels_mr.json | 1 +
 utils/portal/labels/all_labels_or.json | 1 +
 utils/portal/labels/all_labels_ta.json | 1 +
 utils/portal/labels/all_labels_te.json | 1 +
 utils/portal/labels/all_labels_ur.json | 1 +
 12 files changed, 12 insertions(+)
 create mode 100644 utils/portal/labels/all_labels_as.json
 create mode 100644 utils/portal/labels/all_labels_bn.json
 create mode 100644 utils/portal/labels/all_labels_en.json
 create mode 100644 utils/portal/labels/all_labels_gu.json
 create mode 100644 utils/portal/labels/all_labels_hi.json
 create mode 100644 utils/portal/labels/all_labels_kn.json
 create mode 100644 utils/portal/labels/all_labels_ml.json
 create mode 100644 utils/portal/labels/all_labels_mr.json
 create mode 100644 utils/portal/labels/all_labels_or.json
 create mode 100644 utils/portal/labels/all_labels_ta.json
 create mode 100644 utils/portal/labels/all_labels_te.json
 create mode 100644 utils/portal/labels/all_labels_ur.json

diff --git a/utils/portal/labels/all_labels_as.json b/utils/portal/labels/all_labels_as.json
new file mode 100644
index 000000000..78da1f654
--- /dev/null
+++ b/utils/portal/labels/all_labels_as.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"প্ৰস্তুত কৰক"},"lbl":{"ActivityTextbooks":"কার্য্যসমূহ","ACTIVITY_TEXTBOOK_TITLE":"কার্য্যসমূহ","chapter":"শিক্ষণৰ ম’ডিউল","collection_task":"কার্য্যসমূহ","desktop":{"download":"ডাউনল'ড","downloadBook":"ডাউনল'ড","find_more":"অধিক বিষয়বস্তু বিচাৰক","find_more_tasks":"অধিক বিষয়বস্তু বিচাৰক","update":"আপডেট কৰক","updateTextbook":"আপডেট কৰক"},"downloadBooks":"অফলাইন অৱস্থাত প্ৰৱেশাধিকাৰ পাবলৈ ডাউনল’ড কৰক","downloadoffline":"অফলাইন অৱস্থাত প্ৰৱেশাধিকাৰ পাবলৈ ডাউনল’ড কৰক","download_to_access_offline":"অফলাইন অৱস্থাত প্ৰৱেশাধিকাৰ পাবলৈ ডাউনল’ড কৰক","fromTheLearningTask":"শিক্ষণ কার্য্যৰ পৰা","fromTheTextBook":"শিক্ষণ কার্য্যৰ পৰা","import":"অফলাইন অৱস্থাত প্ৰৱেশাধিকাৰ পাবলৈ ডাউনল’ড কৰক","learningmodule":"শিক্ষণৰ ম’ডিউল","mynotebook":"মোৰ টোকাবহী","noBookfoundButtonText":"অধিক চাওক","noBookfoundSubTitle":"আপোনাৰ ব’ৰ্ডত এতিয়াও বিষয়বস্তু সংযোজন কৰিবলৈ আছে। {instance} ত থকা অধিক বিষয়বস্তু চাবলৈ এই বাটনটো টিপক","noBookfoundTitle":"ব’ৰ্ডে বিষয়বস্তু সংযোজন কৰি আছে","noTaskfoundSubTitle":"আপোনাৰ ব’ৰ্ডত এতিয়াও বিষয়বস্তু সংযোজন কৰিবলৈ আছে। {instance} ত থকা অধিক বিষয়বস্তু চাবলৈ এই বাটনটো টিপক","noTaskfoundTitle":"ব’ৰ্ডে বিষয়বস্তু সংযোজন কৰি আছে","seemore":"অধিক চাওক","task":"কার্য্যসমূহ","tasks":"কার্য্যসমূহ","task_title":"কার্য্যসমূহ","textbooks":"কার্য্যসমূহ"}},"messages":{"stmsg":{"m0125":"বিষয়বস্তু প্ৰস্তুত বা আপল’ড কৰা আৰম্ভ কৰক। বৰ্তমান আপোনাৰ খচৰা হিচাপে  ছে’ভ কৰি থোৱা কোনো বিষয়বস্তু নাই","ms0001":"বিষয়বস্তু প্ৰস্তুত বা আপল’ড কৰা আৰম্ভ কৰক। বৰ্তমান আপোনাৰ খচৰা হিচাপে  ছে’ভ কৰি থোৱা কোনো বিষয়বস্তু নাই"}}},"trk":{"completed_learning":"শিক্ষণ সম্পূৰ্ণ হ’ল","essages":{"fmsg":{"m0082":"এই শিক্ষণ কার্য্যটো এতিয়ালৈকে মুকলি হোৱা নাই। আপুনি ইয়াত যোগদান কৰিব নোৱাৰে"}},"frmelmnts":{"btn":{"create":"প্ৰস্তুত কৰক","enroll":"যোগদান কৰক","resumecourse":"পুনৰ আৰম্ভ কৰক","unenroll":"ত্যাগ কৰক","viewcoursestats":"শব্দ লেখ চাওক","viewCourseStatsDashboard":"ডেছব’ৰ্ড চাওক"},"instn":{"t0062":"এই কার্য্যটোৰ বাবে আপুনি এতিয়ালৈকে কোনো বেটছ প্ৰস্তুত কৰা নাই। এটা কার্য্য প্ৰস্তুত কৰক আৰু ডেছব’ৰ্ড পৰীক্ষা কৰক","t0063":"আপুনি এতিয়ালৈকে কোনো কার্য্য প্ৰস্তুত কৰা নাই। এটা নতুন কার্য্য প্ৰস্তুত কৰক আৰু ডেছব’ৰ্ড পুনৰ পৰীক্ষা কৰক"},"lbl":{"accessCourse":"শিক্ষণৰ সামগ্ৰীৰ প্ৰৱেশাধিকাৰ লাভ কৰক","accessToLogin":"এই বিষয়বস্তুৰ প্ৰৱেশাধিকাৰ লাভ কৰিবলৈ, আপুনি লগ ইন কৰিব লাগিব আৰু কার্য্যটোত যোগদান কৰিব লাগিব","ActivityCourses":"কার্য্যসমূহ","ACTIVITY_COURSE_TITLE":"কার্য্যসমূহ","addCourse":"সংযোজন কৰক","completedCourse":"সম্পূৰ্ণ হোৱা কাৰ্যসমূহ","completingCourseSuccessfully":"শিক্ষণ সফলতাৰে সম্পূৰ্ণ  কৰাৰ কাৰণে,","copyAsCourse":"শিক্ষণ সামগ্ৰী হিচাপে প্ৰতিলিপি কৰক","courseContainCertificate":"এই শিক্ষণে আপোনালৈ এখন প্ৰমাণপত্ৰ আগবঢ়ায়","courseDetails":"শিক্ষণৰ সবিশেষ","courseProgress":"অগ্রগতি","courseRelevantFor":"এই শিক্ষণ এইসকলৰ বাবে প্ৰাসংগিক:","courses":"কার্য্যসমূহ","coursestructure":"শিক্ষণৰ ম’ডিউল","courseSuccessMessage":"আপুনি আপোনাৰ শিক্ষণ  সফলতাৰে সম্পূর্ণ কৰিলে","courseSuccessNotificationMessage":"আপোনাৰ পঞ্জীকৃত যোগাযোগ সবিশেষত আপোনাৰ প্ৰমাণপত্ৰৰ বিষয়ে ৭ দিনৰ ভিতৰত আপোনাক জনোৱা হ’ব","courseWithoutCertificateNote":"টোকা: এই শিক্ষণে আপোনাক কোনো প্ৰমাণপত্ৰ প্ৰদান নকৰে","dashboardnocourseselected":"কোনো বাছনি কৰা হোৱা নাই","dashboardnocourseselecteddesc":"তালিকা খনৰ পৰা বাছি লওঁক","downloadCourseQRCode":"কিউ আৰ কোড ডাউনল'ড কৰক","downloadQRCode":{"tooltip":"ক্লিক কৰি কিউ আৰ কোড বিলাক ডাউনল'ড কৰক আৰু সিহতক প্ৰকাশিত পাঠ্য়ক্ৰমৰ লগত লিংক কৰক"},"getUnlimitedAccess":"আপোনাৰ মোবাইল ফোনত পাঠ্যপুথি, টিভি শ্ৰেণী আৰু পাঠ্যক্ৰমসমূহৰ অসীমিত অফলাইন প্ৰৱেশাধিকাৰ লাভ কৰক।","joinTrainingToAcessContent":"এই বিষয়বস্তুত প্ৰৱেশ কৰিবলৈ, আপুনি লগ ইন কৰিব লাগিব আৰু কাৰ্যটোত যোগদান কৰিব লাগিব","moduleFinish":"আপুনি এই কার্য্য সম্পূৰ্ণ কৰিলে","moduleProgress":"কার্য্যৰ অগ্ৰগতি","mytrainings":"মোৰ কার্য্যসমূহ","nextModule":"পৰৱৰ্তী কার্য্য","oneCourse":"কার্য্য","prevModule":"পূৰ্বৰ কার্য্য","returnToCourses":"পিছুৱাই যাওক","sectionTitle":"কার্য্যসমূহ","selectChapter":"কার্য্য বাছি লওক","selectContentFromCourse":"বিষয়বস্তু বাছনি কৰক","trainingAttended":"উপস্থিত থকা শিক্ষণ","courseDontContainCertificate":"বৰ্তমান, এই শিক্ষণ কার্য্যৰ কোনো প্ৰমাণপত্ৰ নাই। কার্য্যটোৰ প্ৰস্তুতকৰ্তাই পাছত এখন প্ৰমাণপত্ৰ সংলগ্ন কৰিব পাৰে।"},"tab":{"courses":"কার্য্যসমূহ"}},"messages":{"dashboard":{"emsg":{"m002":"ব্যৱহাৰকাৰীয়ে এই শিক্ষণ কাৰ্যৰ বাবে কোনো বেটছত যোগদান কৰা নাই"}},"emsg":{"m0002":"এই শিক্ষণ কার্য্য আৰু উপলব্ধ নহয়","m0003":"এই শিক্ষণ কার্য্যৰ কোনো মুকলি বেটছ্ নাই"},"fmsg":{"dataSettingNotSubmitted":"প্ৰ’ফাইল ভাগবতৰাৰ ছেটিংছ আপডেট কৰিব পৰা নাই। পাছত পুনৰ চেষ্টা কৰক","m0001":"দুঃখিত ! আমি আপোনাৰ নামভৰ্তি হোৱা শিক্ষণ কার্য্যৰ তথ্য লাভ কৰিব পৰা নাই। পাছত পুনৰ চেষ্টা কৰক","m0002":"দুঃখিত ! আমি আপোনাৰ বাবে অন্য শিক্ষণ কার্য্য বিচাৰি পোৱা নাই। পাছত পুনৰ চেষ্টা কৰক","m0086":"এই বিষয়বস্তু আৰু উপলব্ধ নহয়"},"imsg":{"m0001":"এই বিষয়বস্তুটো অনুপযুক্ত হিচাপে উঠাই দিয়া হৈছে। এইটো বৰ্তমান নিৰীক্ষণৰ অধীনত","m0026":"নমস্কাৰ, এই বিষয়বস্তু বৰ্তমান উপলব্ধ নহয়। সম্ভৱতঃ ইয়াক পৰিৱৰ্তন কৰি থকা হৈছে"},"stmsg":{"m0125":"বিষয়বস্তু প্ৰস্তুত বা আপল’ড কৰা আৰম্ভ কৰক। বৰ্তমান আপুনি কোনো খচৰা বিষয়বস্তু ছে’ভ কৰি থোৱা নাই"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"পাঠ্যক্ৰমসমুহ","ACTIVITY_TEXTBOOK_TITLE":"পাঠ্যক্ৰমসমূহ","chapter":"পাঠ্যক্ৰমৰ মডিউল","desktop":{"downloadBook":"পাঠ্যক্ৰম ডাউনল’ড কৰক","find_more":"{instance}ত অধিক পাঠ্যক্ৰম আৰু সম্পৰ্কীয় বিষয়বস্তু বিচাৰক","updateTextbook":"পাঠ্যক্ৰম আপডেট কৰক"},"downloadBooks":"অফলাইন হৈ থকা অৱস্থাত প্ৰৱেশাধিকাৰ পাবৰ বাবে পাঠ্যক্ৰমসমূহ ডাউনল’ড কৰক","fromTheTextBook":"পাঠ্যক্ৰমটোৰ পৰা","noBookfoundTitle":"ব’ৰ্ডে পাঠ্যক্ৰমসমূহ সংযোজন কৰি আছে","textbooks":"পাঠ্যক্ৰমসমূহ"}}},"trk":{"completedCourse":"পাঠ্যক্ৰম সম্পূৰ্ণ হ’ল","frmelmnts":{"btn":{"createCourse":"পাঠ্যক্ৰম প্ৰস্তুত কৰক","enroll":"পাঠ্যক্ৰমত যোগদান কৰক","resumecourse":"পাঠ্যক্ৰম পুনৰ আৰম্ভ কৰক","unenroll":"পাঠ্যক্ৰম ত্যাগ কৰক","viewcoursestats":"পাঠ্যক্ৰমৰ  ডাটা শব্দ লেখ চাওক","viewCourseStatsDashboard":"পাঠ্যক্ৰমৰ ডেচব'ৰ্ড দর্শন কৰক"},"instn":{"t0062":"আপুনি এই পাঠ্যক্ৰমৰ বাবে এতিয়ালৈকে এটা বেটছ্ গঠন কৰা নাই। নতুন বেটছ্ গঠন কৰক আৰু ডেছব’ৰ্ড পুনৰ পৰীক্ষা কৰক।","t0063":"আপুনি এতিয়ালৈকে  একো পাঠ্যক্ৰম তৈয়াৰ কৰা নাই। এটা নতুন পাঠ্যক্ৰম তৈয়াৰ কৰক আৰু আকৌ ডেছব’ৰ্ড  পৰীক্ষণ কৰক।"},"lbl":{"accessCourse":"পাঠ্যক্ৰমত প্ৰৱেশ লাভ কৰক","accessToLogin":"পাঠ্যক্ৰমৰ প্ৰৱেশযোগ্যতা লাভ কৰিবলৈ আপুনি লগ ইন কৰিব লাগিব আৰু পাঠ্যক্ৰমত যোগদান কৰিব লাগিব","ActivityCourses":"পাঠ্যক্ৰমসমূহ","ACTIVITY_COURSE_TITLE":"পাঠ্যক্ৰমসমূহ","addCourse":"পাঠ্যক্ৰম যোগ কৰক","completedCourse":"পাঠ্যক্ৰম সম্পূৰ্ণ হ’ল","completingCourseSuccessfully":"পাঠ্যক্ৰম সফলতাৰে সম্পূৰ্ণ  কৰাৰ কাৰণে,","copyAsCourse":"পাঠ্যক্ৰম হিচাপে প্ৰতিলিপি কৰক","courseContainCertificate":"এইটো এটা প্ৰমাণপত্ৰ থকা পাঠ্যক্ৰম","courseDetails":"পাঠ্যক্ৰমৰ সবিশেষ","courseDontContainCertificate":"বৰ্তমান,  এই পাঠ্যক্ৰমৰ  কোনো প্ৰমাণপত্ৰ নাই। পাঠ্যক্ৰমৰ প্ৰস্তুতকৰ্তাই পাছত এখন প্ৰমাণপত্ৰ সংলগ্ন কৰিব পাৰে ।","courseLastUpdatedOn":"ত পাঠ্যক্ৰম শেহতীয়াকৈ আপডেট কৰা হৈছিল","courseProgress":"পাঠ্যক্ৰমৰ অগ্ৰগতি","courseRelevantFor":"এই পাঠ্যক্ৰমটো এইসকলৰ বাবে প্ৰাসংগিক:","courses":"পাঠ্যক্ৰমসমূহ","coursestructure":"পাঠ্যক্ৰমৰ মডিউলসমূহ","courseSuccessMessage":"আপুনি এই পাঠ্যক্ৰম সফলতাৰে সম্পূর্ণ কৰিলে","courseSuccessNotificationMessage":"আপোনাৰ পঞ্জীকৃত যোগাযোগ সবিশেষত আপোনাৰ প্ৰমাণপত্ৰৰ বিষয়ে ৭ দিনৰ ভিতৰত আপোনাক জনোৱা হ’ব","courseWithoutCertificateNote":"টোকা:  এই পাঠ্যক্ৰমৰ কোনো প্ৰমাণপত্ৰ নাই","dashboardnocourseselected":"কোনো পাঠ্যক্ৰম নির্বাচিত নহ’ল","dashboardnocourseselecteddesc":"তালিকা খনৰপৰা এটা পাঠ্যক্ৰম বাছনি কৰক","downloadCourseQRCode":"পাঠ্যক্ৰমৰ কিউ আৰ ক’ড ডাউনল'ড কৰক","downloadQRCode":{"tooltip":"কিউ আৰ ক’ডবিলাক ডাউনল'ড কৰিবলৈ ক্লিক কৰক আৰু সেইসমূহক প্ৰকাশিত পাঠ্যক্ৰমৰ লগত লিংক কৰক"},"enrollcourse":"পাঠ্যক্ৰমত যোগদান কৰক","getUnlimitedAccess":"আপোনাৰ মোবাইল ফোনত পাঠ্যপুথি, পাঠ আৰু পাঠ্যক্ৰমসমূহৰ অসীমিত অফলাইন প্ৰৱেশাধিকাৰ লাভ কৰক।","joinTrainingToAcessContent":"বিষয়বস্তুৰ সম্পূৰ্ণ প্ৰৱেশাধিকাৰ লাভ কৰিবলৈ আপুনি পাঠ্যক্ৰমত যোগদান কৰিবই লাগিব।","moduleFinish":"আপুনি এই অধ্যায় সমাপ্ত কৰিলে","moduleProgress":"মডিউলৰ অগ্ৰগতি","mytrainings":"মোৰ পাঠ্যক্ৰমসমূহ","nextModule":"পৰৱৰ্তী মডিউল","oneCourse":"পাঠ্যক্ৰম","prevModule":"পূৰ্বৰ মডিউল","returnToCourses":"পাঠ্যক্ৰমসমূহলৈ ঘূৰি যাওক","sectionTitle":"পাঠ্যক্ৰমসমূহ","selectChapter":"মডিউল বাছনি কৰক","selectContentFromCourse":"পাঠ্যক্ৰমৰ বাবে বিষয়বস্তু বাছনি কৰক","signinenrollTitle":"এই পাঠ্যক্ৰমটোত যোগদান কৰিবলৈ লগ ইন কৰক","trainingAttended":"উপস্থিত থকা পাঠ্যক্ৰম সমূহ","userName":"ব্যৱহাৰকাৰীৰ নাম"},"tab":{"courses":"পাঠ্যক্ৰমসমূহ"}},"messages":{"dashboard":{"emsg":{"m002":"ব্যৱহাৰকাৰী এই পাঠ্যক্ৰমৰ কোনো বেটছত তালিকাভুক্ত হোৱা নাই"}},"emsg":{"m0002":"পাঠ্যক্ৰমটো বৰ্তমান উপলব্ধ নহয়","m0003":"এই পাঠ্যক্ৰমৰ কোনো মুকলি বেটছ্ নাই"},"fmsg":{"m0001":"গ্ৰাহকীভুক্ত  হোৱা পাঠ্যক্ৰমবোৰ আমদানি কৰাত বিফলতা,পাছত পুনৰ চেষ্টা কৰক","m0002":"অন্য পাঠ্যক্ৰমবোৰ বিচাৰি পাব পৰা হোৱা নাই, পাছত পুনৰ চেষ্টা কৰক...","m0082":"এই পাঠ্যক্ৰমটো  গ্ৰাহকীভুক্ত হোৱাৰ বাবে  মুকলি হোৱা নাই","m0086":"এই পাঠ্যক্ৰমটো লেখকৰদ্বাৰা প্ৰত্যাহাৰ কৰা হৈছে আৰু গতিকে ই কোনোপধ্যেই উপলব্ধ নহ’ব"},"imsg":{"m0001":"এই পাঠ্যক্ৰমটো উপযুক্ত নহয় বুলি চিহ্নিত কৰা হৈছে আৰু বৰ্তমান পুনৰীক্ষণ পৰ্যায়ত আছে।","m0026":"এই পাঠ্যক্ৰম বৰ্তমান উপলব্ধ নহয়। প্ৰস্তুতকৰ্তাই এই পাঠ্যক্ৰমৰ কিছুমান সালসলনি কৰিছে বাবে সম্ভৱ এনে হৈছে।"},"stmsg":{"m0125":"ৰিছ’ৰ্চ, কিতাপ, পাঠ্যক্ৰম  প্ৰস্তুত , সংগ্ৰহ নতুবা আপল’ড কৰা আৰম্ভ কৰক. এই মূহুৰ্তত আপোনাৰ কোনো অগ্ৰগতি হৈ থকা কামৰ খচৰা নাই"}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"পাঠ্যপুথিসমূহ","ACTIVITY_TEXTBOOK_TITLE":"পাঠ্যপুথিসমূহ","chapter":"অধ্যায়","copyAsCourse":"পাঠ্যক্ৰম হিচাপে প্ৰতিলিপি কৰক","desktop":{"deleteCollection":"{name} পাঠ্যপুথি ডিলিট কৰা কাৰ্যই ইয়াক মাই ডাউনল’ড্ছৰ পৰা আঁতৰাইছে। অব্যাহত ৰখাৰ বাবে ডিলিটত ক্লিক কৰক।","downloadBook":"পাঠ্যপুথি ডাউনল’ড কৰক","find_more":"{instance}ত অধিক পাঠ্যপুথি আৰু বিষয়বস্তু বিচাৰক","updateTextbook":"পাঠ্যপুথি আপডেট কৰক"},"dialCodeDescription":"QR ক’ড হ’ল আপোনাৰ পাঠ্যপুথিৰ QR ক’ড ইমেজৰ তলত থকা ৬টা  অংকৰ এটা আলফানিউমাৰিক (বৰ্ণ আৰু সংখ্যা থকা) ক’ড","dialCodeDescriptionGetPage":"QR ক’ড হ’ল আপোনাৰ পাঠ্যপুথিৰ QR ক’ড ইমেজৰ তলত থকা ৬টা  অংকৰ এটা আলফানিউমাৰিক (বৰ্ণ আৰু সংখ্যা থকা) ক’ড","downloadBooks":"অফলাইন হৈ থকা অৱস্থাত প্ৰৱেশাধিকাৰ পাবৰ বাবে কিতাপসমূহ ডাউনল’ড কৰক","fromTheTextBook":"পাঠ্যপুথিৰ পৰা","getUnlimitedAccess":"আপোনাৰ মোবাইল ফোনত পাঠ্যপুথি, পাঠ আৰু পাঠ্যক্ৰমসমূহৰ অসীমিত অফলাইন প্ৰৱেশাধিকাৰ লাভ কৰক","import":"অফলাইন হৈ থকা অৱস্থাত প্ৰৱেশাধিকাৰ পাবৰ বাবে কিতাপসমূহ ডাউনল’ড কৰক","installAppDesc":"আপোনাৰ ডিভাইচত অফলাইন পাঠ, পাঠ্যপুথি আৰু বিষয়বস্তু সংৰক্ষণ কৰক","mynotebook":"মোৰ টোকাবহী","noBookfoundButtonText":"অধিক কিতাপ আৰু বিষয়বস্তু চাওক","noBookfoundSubTitle":"আপোনাৰ ব’ৰ্ডত এতিয়াও অধিক কিতাপ সংযোজন কৰিবলৈ আছে। {instance}ত থকা অধিক কিতাপ আৰু বিষয়বস্তু চাবলৈ এই বাটনটোত টিপক","noBookfoundTitle":"ব’ৰ্ডে কিতাপসমূহ সংযোজন কৰি আছে","textbooks":"পাঠ্যপুথিসমূহ"}},"messages":{"stmsg":{"m0125":"ৰিছ’ৰ্চ, কিতাপ, পাঠ্যক্ৰম  প্ৰস্তুত , সংগ্ৰহ নতুবা আপল’ড কৰা আৰম্ভ কৰক. এই মূহুৰ্তত আপোনাৰ কোনো অগ্ৰগতি হৈ থকা কামৰ খচৰা নাই"}}},"trk":{"frmelmnts":{"btn":{"enroll":"পঢ়ক","resumecourse":"পঢ়ি থকাটো পুনৰ আৰম্ভ কৰক","unenroll":"বন্ধ কৰক"},"instn":{"t0062":"আপুনি এতিয়ালৈকে এই পাঠ্যক্ৰমৰ বাবে কোনো শিক্ষণ /পঠনৰ বেটছ্ প্ৰস্তুত কৰা নাই। এটা বেটছ্ প্ৰস্তুত কৰক আৰু ডেছব”ৰ্ড পৰীক্ষণ কৰক","t0063":"আপুনি এতিয়ালৈকে  কোনো পাঠ্যপুথি প্ৰস্তুত কৰা নাই। পাঠ্যপুথি প্ৰস্তুত কৰক আৰু ডেছব’ৰ্ড  পৰীক্ষণ কৰক"},"lbl":{"accessCourse":"পাঠ্যপুথিত প্ৰৱেশ কৰক","accessToLogin":"পাঠ্যপুথিত প্ৰৱেশ কৰিবলৈ আপুনি লগ ইন কৰিব লাগিব আৰু শিক্ষণ/পঠন বেটছত  যোগদান কৰিব লাগিব","ActivityCourses":"পাঠ্যপুথি","ACTIVITY_COURSE_TITLE":"পাঠ্যপুথি","addCourse":"পাঠ্যপুথি যোগ কৰক","completedCourse":"সম্পূৰ্ণ হোৱা পাঠ্যপুথিসমূহ","completingCourseSuccessfully":"শিক্ষণ সফলতাৰে সম্পূৰ্ণ  কৰাৰ কাৰণে,","copyAsCourse":"পাঠ্যপুথি হিচাপে প্ৰতিলিপি কৰক","courseDetails":"পাঠ্যপুথিৰ সবিশেষ","courses":"পাঠ্যপুথিসমূহ","coursestructure":"অধ্যায়","joinTrainingToAcessContent":"বিষয়বস্তুৰ প্ৰৱেশাধিকাৰ লাভ কৰিবলৈ,  আপুনি শিক্ষণ বেটছত যোগদান কৰিব লাগিব","moduleFinish":"আপুনি এই অধ্যায় সম্পূৰ্ণ কৰিলে","moduleProgress":"অধ্যায়ৰ অগ্ৰগতি","mytrainings":"মোৰ ডিজিটেল পাঠ্যপুথিসমূহ","nextModule":"পৰৱৰ্তী অধ্যায়","oneCourse":"ডিজিটেল পাঠ্যপুথি","prevModule":"পূৰ্বৰ অধ্যায়","sectionTitle":"ডিজিটেল পাঠ্যপুথিসমূহ","selectChapter":"অধ্যায় বাছি লওক","trainingAttended":"পঢ়ি উঠা পাঠ্যপুথিসমূহ","courseContainCertificate":"এই শিক্ষণে আপোনালৈ এখন প্ৰমাণপত্ৰ আগবঢ়ায়","courseDontContainCertificate":"বৰ্তমান, এই শিক্ষণ কার্য্যৰ কোনো প্ৰমাণপত্ৰ নাই। কার্য্যটোৰ প্ৰস্তুতকৰ্তাই পাছত এখন প্ৰমাণপত্ৰ সংলগ্ন কৰিব পাৰে।"},"tab":{"courses":"ডিজিটেল পাঠ্যপুথি"}},"messages":{"emsg":{"m0002":"এই পাঠ্যপুথি আৰু উপলব্ধ নহয়"},"fmsg":{"dataSettingNotSubmitted":"প্ৰ’ফাইল ভাগবতৰাৰ ছেটিংছ আপডেট কৰিব পৰা নাই। পাছত পুনৰ চেষ্টা কৰক","m0001":"দুঃখিত ! আমি আপুনি বিচাৰি থকা পাঠ্যপুথিখন পোৱা নাই। পাছত পুনৰ চেষ্টা কৰক","m0002":"দুঃখিত ! আমি আপোনাৰ বাবে অন্য পাঠ্যপুথি বিচাৰি পোৱা নাই। পাছত পুনৰ চেষ্টা কৰক","m0086":"এই পাঠ্যপুথি আৰু উপলব্ধ নহয়"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"টিভি শ্ৰেণীসমূহ","ACTIVITY_TEXTBOOK_TITLE":"টিভি শ্ৰেণীসমূহ","ACTIVITY_TV_CLASS_TITLE":"টিভি শ্ৰেণীসমূহ","chapter":"টিভিৰ কার্য্যসূচী","collection_tv_classes":"টিভি শ্ৰেণীসমূহ","desktop":{"downloadBook":"টিভি শ্ৰেণীসমূহ ডাউনল’ড কৰক","downloadTVclasses":"টিভি শ্ৰেণীসমূহ ডাউনল’ড কৰক","find_more":"{instance}ত অধিক টিভি শ্ৰেণী আৰু সম্পৰ্কীয় বিষয়বস্তু বিচাৰক","find_more_TVclasses":"{instance}ত অধিক টিভি শ্ৰেণী আৰু সম্পৰ্কীয় বিষয়বস্তু বিচাৰক","updateTextbook":"টিভি শ্ৰেণীসমূহ আপডেট কৰক","updateTVclasses":"টিভি শ্ৰেণীসমূহ আপডেট কৰক"},"downloadBooks":"অফলাইন হৈ থকা অৱস্থাত প্ৰৱেশাধিকাৰ পাবৰ বাবে টিভি শ্ৰেণীসমূহ ডাউনল’ড কৰক","downloadTVclasses":"অফলাইন হৈ থকা অৱস্থাত প্ৰৱেশাধিকাৰ পাবৰ বাবে টিভি শ্ৰেণীসমূহ ডাউনল’ড কৰক","fromTheTextBook":"টিভি শ্ৰেণীৰ পৰা","fromTheTVclasses":"টিভি শ্ৰেণীৰ পৰা","noBookfoundTitle":"ব’ৰ্ডে টিভি শ্ৰেণীসমূহ সংযোজন কৰি আছে","textbooks":"টিভি শ্ৰেণীসমূহ","TVclassesfoundTitle":"ব’ৰ্ডে টিভি শ্ৰেণীসমূহ সংযোজন কৰি আছে","tv_classes":"টিভি শ্ৰেণীসমূহ","tv_program":"টিভিৰ কার্য্যসূচী"}}},"trk":{"frmelmnts":{"btn":{"enroll":"চাওক","resumecourse":"চাই থকাটো পুনৰ আৰম্ভ কৰক"},"instn":{"t0062":"আপুনি এতিয়ালৈকে এই টিভি শ্ৰেণীৰ বাবে কোনো শিক্ষণৰ বেটছ্ প্ৰস্তুত কৰা নাই। এটা বেটছ্ প্ৰস্তুত কৰক আৰু ডেছব”ৰ্ড পৰীক্ষণ কৰক","t0063":"আপুনি এতিয়ালৈকে  কোনো টিভি শ্ৰেণী প্ৰস্তুত কৰা নাই। এটা টিভি শ্ৰেণী প্ৰস্তুত কৰক আৰু ডেছব’ৰ্ড  পৰীক্ষণ কৰক"},"lbl":{"accessCourse":"টিভি শ্ৰেণীসমূহত প্ৰৱেশ কৰক","accessToLogin":"পাঠ্যপুথিত প্ৰৱেশ কৰিবলৈ আপুনি লগ ইন কৰিব লাগিব আৰু শিক্ষণ বেটছত  যোগদান কৰিব লাগিব","ActivityCourses":"টিভি শ্ৰেণীসমূহ","ACTIVITY_COURSE_TITLE":"টিভি শ্ৰেণীসমূহ","addCourse":"টিভি শ্ৰেণী যোগ কৰক","completedCourse":"সম্পূৰ্ণ হোৱা টিভি শ্ৰেণীসমূহ","copyAsCourse":"টিভি শ্ৰেণী হিচাপে প্ৰতিলিপি কৰক","courseContainCertificate":"এই শিক্ষণে আপোনালৈ এখন প্ৰমাণপত্ৰ আগবঢ়ায়","courseDetails":"টিভি শ্ৰেণীৰ সবিশেষ","courses":"টিভি শ্ৰেণীসমূহ","coursestructure":"টিভিৰ কার্য্যসূচী","moduleFinish":"আপুনি এই কার্য্যসূচী সম্পূৰ্ণ কৰিলে","moduleProgress":"কাৰ্য্যসূচীৰ অগ্ৰগতি","mytrainings":"মোৰ টিভি শ্ৰেণীসমূহ","nextModule":"পৰৱৰ্তী কার্য্যসূচী","oneCourse":"টিভি শ্ৰেণী","prevModule":"পূৰ্বৰ কার্য্যসূচী","sectionTitle":"টিভি শ্ৰেণীসমূহ","selectChapter":"কার্য্যসূচী বাছি লওক","trainingAttended":"চাই উঠা টিভি শ্ৰেণীসমূহ","courseDontContainCertificate":"বৰ্তমান, এই শিক্ষণ কার্য্যৰ কোনো প্ৰমাণপত্ৰ নাই। কার্য্যটোৰ প্ৰস্তুতকৰ্তাই পাছত এখন প্ৰমাণপত্ৰ সংলগ্ন কৰিব পাৰে।"},"tab":{"courses":"টিভি শ্ৰেণীসমূহ"}},"messages":{"emsg":{"m0002":"টিভি শ্ৰেণীৰ কার্য্য আৰু উপলব্ধ নহয়"},"fmsg":{"m0001":"দুঃখিত ! আমি আপুনি বিচাৰি থকা টিভি শ্ৰেণীসমূহ পোৱা নাই। পাছত পুনৰ চেষ্টা কৰক","m0002":"দুঃখিত ! আমি আপোনাৰ বাবে অন্য টিভি শ্ৰেণী বিচাৰি পোৱা নাই। পাছত পুনৰ চেষ্টা কৰক","m0086":"এই টিভি শ্ৰেণী আৰু উপলব্ধ নহয়"}}}}}
\ No newline at end of file
diff --git a/utils/portal/labels/all_labels_bn.json b/utils/portal/labels/all_labels_bn.json
new file mode 100644
index 000000000..975c8abde
--- /dev/null
+++ b/utils/portal/labels/all_labels_bn.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"তৈরি করুন"},"lbl":{"ActivityTextbooks":"কাজগুলি","ACTIVITY_TEXTBOOK_TITLE":"টাস্কগুলি","chapter":"শেখার মডিউল","collection_task":"করণীয় কাজগুলি","desktop":{"download":"ডাউনলোড করুন","downloadBook":"ডাউনলোড করুন","find_more":"আরও বিষয়বস্তু সন্ধান করুন","find_more_tasks":"আরও বিষয়বস্তু সন্ধান করুন","update":"আপডেট করুন","updateTextbook":"আপডেট করুন"},"downloadBooks":"অফলাইনে অ্যাকসেস করতে ডাউনলোড করুন","downloadoffline":"অফলাইনে অ্যাক্সেস পাওয়ার জন্য ডাউনলোড করুন","download_to_access_offline":"অফলাইনে অ্যাক্সেস বা প্রবেশ করার জন্য  ডাউনলোড করুন","fromTheLearningTask":"প্রশিক্ষণের কাজ থেকে","fromTheTextBook":"প্রশিক্ষণের কাজগুলি থেকে","import":"অফলাইনে অ্যাক্সেস করতে ডাউনলোড করুন","learningmodule":"প্রশিক্ষণ মডিউল","mynotebook":"আমার নোটবুক","noBookfoundButtonText":"আরো দেখুন","noBookfoundSubTitle":"আপনার বোর্ডে এখনও বিষয়বস্তু যোগ করা যাবে। {instance}-এ আরও বিষয়বস্তু দেখার জন্য বাটন-টিতে ট্যাপ করুন","noBookfoundTitle":"বোর্ড বিষয়বস্তু যুক্ত করছে","noTaskfoundSubTitle":"আপনার বোর্ডে এখনও বিষয়বস্তূ যোগ করা বাকি আছে। {instance}-এ আরও বিষয়বস্তু দেখার জন্য বাটন বা বোতামটিতে ট্যাপ করুন","noTaskfoundTitle":"বোর্ড বিষয়বস্তু  যুক্ত করছে","seemore":"আরো দেখুন","task":"কাজগুলি","tasks":"কাজগুলি","task_title":"করণীয় কাজগুলি","textbooks":"কাজগুলি"}},"messages":{"stmsg":{"m0125":"বিষয়বস্তু তৈরি বা আপলোড করা শুরু করুন।  বর্তমানে আপনার খসড়া হিসেবে কোনও বিষয়বস্তু সংরক্ষণ করা নেই।","ms0001":"বিষয়বস্তু তৈরি বা আপলোড করা শুরু করুন।  বর্তমানে আপনার কোনও বিষয়বস্তু ড্রাফ্ট বা খসড়া হিসেবে সংরক্ষণ করা নেই।"}}},"trk":{"completed_learning":"শেখা সম্পূর্ণ হয়েছে","essages":{"fmsg":{"m0082":"এই  প্রশিক্ষণ কাজটি এখনও পর্যন্ত খোলা হয়নি। আপনি এটিতে যোগদান করতে পারবেন না।"}},"frmelmnts":{"btn":{"create":"তৈরি করুন","enroll":"যোগদান করুন","resumecourse":"আবার শুরু করুন","unenroll":"ছাড়ুন","viewcoursestats":"পরিসংখ্যান দেখুন","viewCourseStatsDashboard":"ড্যাশবোর্ড দেখুন"},"instn":{"t0062":"আপনি এখনও পর্যন্ত এই টাস্কের জন্য কোনও ব্যাচ তৈরি করেন নি।  একটি টাস্ক তৈরি করুন এবং ড্যাশবোর্ডটি  চেক করুন","t0063":"আপনি এখনও পর্যন্ত কোনও টাস্ক তৈরি করেননি। একটি নতুন টাস্ক তৈরি করুন ও ড্যাশবোর্ডটি আবার চেক করুন।"},"lbl":{"accessCourse":"শিক্ষণীয় বিষয়বস্তুগুলি পেতে থাকুন","accessToLogin":"বিষয়বস্তুটি অ্যাক্সেস করতে আপনাকে লগ ইন করতে হবে এবং কাজে যোগদান করতে হবে","ActivityCourses":"টাস্কগুলি","ACTIVITY_COURSE_TITLE":"কাজ গুলি","addCourse":"যোগ করুন","completedCourse":"সম্পূর্ণ হওয়া কাজগুলি","completingCourseSuccessfully":"শেখা সফলভাবে  সম্পূর্ণ করার জন্য,","copyAsCourse":"প্রশিক্ষণের বিষয়বস্তু হিসাবে কপি করুন","courseContainCertificate":"এই প্রশিক্ষণটি সম্পূর্ণ করার পর আপনি একটি সার্টিফিকেট বা শংসাপত্র পাবেন","courseDetails":"প্রশিক্ষণ সংক্রান্ত বিবরণ","courseProgress":"এই প্রশিক্ষণটি নিম্নলিখিত ক্ষেত্রে প্রাসঙ্গিক:","courseRelevantFor":"এই প্রশিক্ষণটি নিম্নলিখিত ক্ষেত্রে প্রাসঙ্গিক:","courses":"প্রদত্ত কাজগুলি","coursestructure":"শেখার মডিউল","courseSuccessMessage":"আপনি সফলভাবে আপনার  প্রশিক্ষণ সম্পূর্ণ করেছেন","courseSuccessNotificationMessage":"আপনাকে আগামী 7 দিনের মধ্যে আপনার নথিভুক্ত যোগাযোগের ঠিকানা বা ফোন নম্বরে আপনার শংসাপত্রের বিষয়ে জানানো হবে।","courseWithoutCertificateNote":"বিজ্ঞপ্তি: এই প্রশিক্ষণটির জন্য আপনাকে কোনও শংসাপত্র দেওয়া হবে না","dashboardnocourseselected":"কোনও নির্বাচন করা হয়নি","dashboardnocourseselecteddesc":"তালিকাটি থেকে নির্বাচন করুন","downloadCourseQRCode":"QR কোডটি ডাউনলোড করুন","downloadQRCode":{"tooltip":"QR কোডগুলি ডাউনলোড করতে ক্লিক করুন এবং এগুলি আপনার প্রকাশিত বিষয়বস্তুর সাথে লিঙ্কযুক্ত করুন"},"getUnlimitedAccess":"আপনার মোবাইল ফোনের মাধ্যমে অফলাইন থাকাকালীন টেক্সটবুক, টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠান ও কোর্সগুলিতে অবাধে অ্যাক্সেস পেতে থাকুন।","joinTrainingToAcessContent":"বিষয়বস্তুতে অ্যাকসেস পেতে গেলে, আপনাকে লগইন করতে হবে ও টাস্কটিতে যোগদান করতে হবে।","moduleFinish":"আপনি এই কাজটি সম্পূর্ণ করেছেন","moduleProgress":"কাজের অগ্রগতি","mytrainings":"আমার করণীয় কাজগুলি","nextModule":"পরবর্তী কাজ","oneCourse":"টাস্ক","prevModule":"পূর্ববর্তী কাজ","returnToCourses":"ফিরে যান","sectionTitle":"করণীয় কাজগুলি","selectChapter":"কাজ নির্বাচন করুন","selectContentFromCourse":"বিষয়বস্তু নির্বাচন করুন","trainingAttended":"প্রশিক্ষণে উপস্থিতির সংখ্যা","courseDontContainCertificate":"বর্তমানে, এই প্রশিক্ষণ কাজের জন্য কোনো শংসাপত্র দেওয়া হয় না। পরবর্তী কালে প্রশিক্ষণের উদ্যোক্তা একটি শংসাপত্র অ্যাটাচ করে দিতে পারেন"},"tab":{"courses":"কাজগুলি"}},"messages":{"dashboard":{"emsg":{"m002":"ব্যবহারকারী ব্যক্তি প্রশিক্ষণের উদ্দেশ্যে দেওয়া কাজটি করার জন্য কোনও ব্যাচে যোগদান করেননি"}},"emsg":{"m0002":"প্রশিক্ষণের জন্য প্রয়োজনীয় এই কাজটি আর পাওয়া যাবে না","m0003":"এই শিক্ষণীয় কাজটির কোনও ওপেন ব্যাচ নেই"},"fmsg":{"dataSettingNotSubmitted":"প্রোফাইল শেয়ার করার সেটিংস আপডেট করা যায়নি।  পরে আবার চেষ্টা করুন","m0001":"দুঃখিত! আপনি যে প্রশিক্ষণ কাজের জন্য নিজেকে নথিভুক্ত করেছিলেন সে বিষয় আমরা কোনও তথ্য পাইনি। পরে আবার চেষ্টা করুন","m0002":"দুঃখিত!  আমরা আপনার জন্য অন্যান্য শেখার কাজগুলি দিতে পারছি না।  পরে আবার চেষ্টা করুন","m0086":"এই বিষয়বস্তুটি আর পাওয়া যাবে না"},"imsg":{"m0001":"এই বিষয়বস্তুটি অনুপযুক্ত হিসাবে চিহ্নিত করা হয়েছে।  এটি বর্তমানে পুর্নবিবেচনা করে দেখা হচ্ছে।","m0026":"হাই, বর্তমানে এই বিষয়বস্তুটি আপনি পাবেন না। হতে পারে যে বিষয়বস্তুটিতে কিছু পরিবর্তন করা হচ্ছে।"},"stmsg":{"m0125":"বিষয়বস্তু তৈরি বা আপলোড করা শুরু করুন।  বর্তমানে আপনি কোনও খসড়া বিষয়বস্তু সংরক্ষণ করেননি"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"কোর্স গুলি","ACTIVITY_TEXTBOOK_TITLE":"কোর্সগুলো","chapter":"কোর্স মডিউল","desktop":{"downloadBook":"কোর্স ডাউনলোড করুন","find_more":"{instance} এ আরও কোর্স এবং সম্পর্কিত বিষয়বস্তু সন্ধান করুন","updateTextbook":"কোর্স আপডেট করুন"},"downloadBooks":"অফলাইনে থাকাকালীন কোর্সগুলিতে অ্যাক্সেস পেতে সেগুলি ডাউনলোড করুন","fromTheTextBook":"কোর্সটি থেকে","noBookfoundTitle":"বোর্ড কোর্সগুলি যুক্ত করছে","textbooks":"কোর্সগুলো"}}},"trk":{"completedCourse":"কোর্স বা পাঠক্রম সম্পূর্ণ হয়েছে","frmelmnts":{"btn":{"createCourse":"কোর্স তৈরি করুন","enroll":"কোর্সে যোগ দিন","resumecourse":"কোর্সটি আবার শুরু করুন","unenroll":"কোর্সটি ছেড়ে দিন","viewcoursestats":"কোর্সের পরিসংখ্যান দেখুন","viewCourseStatsDashboard":"কোর্স ড্যাশবোর্ডটি দেখুন"},"instn":{"t0062":"আপনি এখনো এই কোর্সের জন্য একটিও ব্যাচ  তৈরি করেননি। একটি নতুন ব্যাচ তৈরি করুন এবং আবার ড্যাশবোর্ডটি চেক করুন।","t0063":"আপনি এখনো কোনও কোর্স তৈরি করেনি। নতুন কোর্স তৈরি করুন এবং আবার ড্যাশবোর্ডটি চেক করুন।"},"lbl":{"accessCourse":"কোর্সটিতে অ্যাক্সেস করুন","accessToLogin":"কোর্সটি করার জন্য আপনাকে লগ-ইন করতে হবে ও কোর্সটিতে যোগদান করতে হবে","ActivityCourses":"কোর্সগুলি","ACTIVITY_COURSE_TITLE":"কোর্সগুলি","addCourse":"কোর্সটিকে যুক্ত করুন","completedCourse":"কোর্সগুলি সম্পূর্ণ হয়েছে","completingCourseSuccessfully":"প্রশিক্ষণটি সফলভাবে সম্পূর্ণ করার জন্য","copyAsCourse":"কোর্স হিসেবে কপি করুন","courseContainCertificate":"এটি একটি শংসাপত্রের কোর্স","courseDetails":"কোর্স-সংক্রান্ত বিবরণ","courseDontContainCertificate":"বর্তমানে, এই প্রশিক্ষণটির জন্য কোনও শংসাপত্র দেওয়া হয় না। যে ব্যক্তি প্রশিক্ষণটির উদ্যোক্তা তিনি পরে একটি শংসাপত্র অ্যাটাচ বা সংযুক্ত করে দিতে পারেন।","courseLastUpdatedOn":"কোর্সটি শেষ আপডেট করা হয়েছে","courseProgress":"কোর্সের অগ্রগতি","courseRelevantFor":"কোর্সটি এর  জন্য প্রাসঙ্গিক:","courses":"কোর্সগুলি","coursestructure":"কোর্সের মডিউলগুলি","courseSuccessMessage":"আপনি সফলভাবে কোর্সটি শেষ করেছেন","courseSuccessNotificationMessage":"আপনাকে কোর্স শংসাপত্র সম্পর্কে ৭ দিনের মধ্যে আপনার নিবন্ধিত যোগাযোগ ঠিকানায় অবহিত করা হবে","courseWithoutCertificateNote":"দ্রষ্টব্য: এই কোর্সটির পর কোনও শংসাপত্র পাওয়া যাবে না","dashboardnocourseselected":"কোনও কোর্স নির্বাচিত নির্বাচন করা হয়নি","dashboardnocourseselecteddesc":"তালিকাটি থেকে একটি কোর্স নির্বাচন করুন","downloadCourseQRCode":"কোর্সের QR  কোড ডাউনলোড করুন","downloadQRCode":{"tooltip":"QR কোড ডাউনলোড করতে হলে ক্লিক করুন এবং প্রকাশিত কোর্সের সাথে লিংকযুক্ত করুন"},"enrollcourse":"কোর্সে যোগ দিন","getUnlimitedAccess":"আপনার মোবাইল ফোন থেকে অফলাইনে টেক্সটবুক, প্রশিক্ষণ এবং কোর্সগুলিতে অবাধ অ্যাক্সেস পান","joinTrainingToAcessContent":"সমগ্র বিষয়বস্তুটিতে অ্যাক্সেস পাওয়ার জন্য আপনাকে অবশ্যই কোর্সটিতে যোগদান করতে হবে।","moduleFinish":"আপনি এই মডিউলটি সম্পূর্ণ করেছেন","moduleProgress":"মডিউলের অগ্রগতি","mytrainings":"আমার কোর্সগুলি","nextModule":"পরবর্তী মডিউল","oneCourse":"কোর্স","prevModule":"আগের মডিউলটি","returnToCourses":"কোর্সে ফিরে আসুন","sectionTitle":"কোর্সগুলি","selectChapter":"মডিউল নির্বাচন করুন","selectContentFromCourse":"কোর্সের জন্য বিষয়বস্তু নির্বাচন করুন","signinenrollTitle":"এই কোর্সে ভর্তির জন্য লগ ইন করুন","trainingAttended":"যতগুলি কোর্সে উপস্থিত ছিলেন","userName":"ব্যবহারকারীর নাম"},"tab":{"courses":"কোর্সগুলি"}},"messages":{"dashboard":{"emsg":{"m002":"এই কোর্সের কোনো ব্যাচের মধ্যে এই ব্যবহারকারীর নাম নথিভুক্ত করা হয়নি"}},"emsg":{"m0002":"কোর্সটি এখন বন্ধ আছে","m0003":"এই কোর্সটির  কোনও ওপেন ব্যাচ নেই"},"fmsg":{"m0001":"নথিভুক্ত কোর্সটিকে আনা যায়নি, পরে আবার চেষ্টা করুন","m0002":"অন্যান্য কোর্স আনা যায়নি, পরে আবার চেষ্টা করুন","m0082":"এই কোর্সটি তালিকাভুক্তির জন্য উন্মুক্ত নয়","m0086":"এই কোর্সটি যিনি তৈরি করেছিলেন তিনি সেটি প্রত্যাহার করে নিয়েছেন ও সেই জন্য কোর্সটি আর করা যাবে না।"},"imsg":{"m0001":"এই কোর্সটি অনুপযুক্ত হিসেবে চিহ্নিত করা হয়েছে ও বর্তমানে কোর্সটি নিয়ে  পুনর্বিবেচনা করা হচ্ছে","m0026":"এই কোর্সটি এখন আপাতত উপলব্ধ নয়। সম্ভবত এর সৃষ্টা এই কোর্সটিতে কিছু পরিবর্তন করেছেন।"},"stmsg":{"m0125":"প্রয়োজনীয় বিষয়বস্তু, বই, কোর্স তৈরি করা  বা সংগৃহীত তথ্য আপলোড করা শুরু করুন। এই মুহুর্তে আপনি সঠিকভাবে কাজ করছেন কি না সে বিষয়ে কোনও নথি বা ড্রাফ্ট নেই।"}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"টেক্সটবুকগুলি","ACTIVITY_TEXTBOOK_TITLE":"টেক্সটবুকগুলি","chapter":"অধ্যায়","copyAsCourse":"কোর্স হিসেবে কপি করুন","desktop":{"deleteCollection":"{name} টেক্সটবুকটি ডিলিট করা হলে My Download (মাই ডাউনলোড) ফোল্ডার থেকে সেটি সম্পূর্ণ অপসারিত হবে। প্রক্রিয়াটি সম্পূর্ণ করার জন্য ডিলিট-এ ক্লিক করুন।","downloadBook":"টেক্সটবুকটি ডাউনলোড করুন","find_more":"{instance}-এ আরও টেক্সটবুক এবং বিষয়বস্তু সন্ধান করুন","updateTextbook":"টেক্সটবুক আপডেট করুন"},"dialCodeDescription":"QR কোডটি আপনার টেক্সট বুকের QR কোড ছবিটির নীচে দেওয়া ৬ সংখ্যার আলফা-নিউমেরিক কোড","dialCodeDescriptionGetPage":"QR কোড হল ৬ সংখ্যার আলফা-নিউমেরিক কোড যা আপনার টেক্সটবুকের QR  কোড চিত্রের নিচে দেখতে পাবেন","downloadBooks":"অফলাইনে থাকাকালীন অ্যাক্সেসের জন্য বইগুলি ডাউনলোড করুন","fromTheTextBook":"টেক্সটবুক থেকে","getUnlimitedAccess":"আপনার মোবাইল ফোনের মাধ্যমে অফলাইন থাকাকালীন অসংখ্য টেক্সটবুক, প্রশিক্ষণ ও কোর্সের সন্ধান পেতে থাকুন","import":"অফলাইনে থাকাকালীন অ্যাক্সেসের জন্য বইগুলি ডাউনলোড করুন","installAppDesc":"অফলাইনে থাকাকালীন আপনার ডিভাইসে প্রশিক্ষণ, টেক্সটবুক এবং বিষয়বস্তু সংগ্রহ করুন","mynotebook":"আমার নোটবুক","noBookfoundButtonText":"আরও বই এবং বিষয়বস্তু দেখুন","noBookfoundSubTitle":"আপনার বোর্ডটিতে এখনও আরও বই যোগ করা যাবে। {instance} তে আরও বই এবং বিষয়বস্তু দেখতে বোতামটিতে ট্যাপ করুন","noBookfoundTitle":"বোর্ড বই যোগ করছে","textbooks":"টেক্সটবুক"}},"messages":{"stmsg":{"m0125":"বিষয়বস্তু, বই, কোর্স, রচনা সমগ্র ইত্যাদি তৈরি করা বা আপলোড করা শুরু করুন।এই মুহুর্তে আপনার কোন কাজের অগ্রগতির খসড়া নেই"}}},"trk":{"frmelmnts":{"btn":{"enroll":"পড়ুন","resumecourse":"আবার পড়া শুরু করুন","unenroll":"বন্ধ করুন"},"instn":{"t0062":"আপনি এখনও পর্যন্ত এই টেক্সটবুকের জন্য কোনও প্রশিক্ষণ/ পড়ার ব্যাচ তৈরি করেননি।  একটি ব্যাচ তৈরি করুন এবং ড্যাশবোর্ডটি চেক  করুন","t0063":"আপনি এখনও পর্যন্ত কোনও টেক্সটবুক তৈরি করেননি।  একটি টেক্সটবুক তৈরি করুন এবং ড্যাশবোর্ডটি চেক করুন"},"lbl":{"accessCourse":"টেক্সটবুকটিতে অ্যাক্সেস করুন","accessToLogin":"টেক্সটবুকটি অ্যাক্সেস করতে আপনাকে অবশ্যই লগ ইন করতে হবে এবং প্রশিক্ষণ / পড়ার ব্যাচে যোগদান করতে হবে","ActivityCourses":"টেক্সটবুক","ACTIVITY_COURSE_TITLE":"টেক্সটবুক","addCourse":"টেক্সটবুকটি যুক্ত করুন","completedCourse":"সম্পূর্ণ হওয়া টেক্সটবুকগুলি","completingCourseSuccessfully":"সাফল্যের সাথে শেখার জন্য,","copyAsCourse":"টেক্সটবুক হিসাবে কপি করুন","courseDetails":"টেক্সটবুকের বিস্তারিত বিবরণ","courses":"টেক্সটবুকগুলি","coursestructure":"অধ্যায়","joinTrainingToAcessContent":"বিষয়বস্তু অ্যাক্সেস করতে, আপনাকে প্রশিক্ষণ ব্যাচে যোগদান করতে হবে","moduleFinish":"আপনি এই অধ্যায়টি সম্পূর্ণ করেছেন","moduleProgress":"অধ্যায়ের অগ্রগতি","mytrainings":"আমার ডিজিটাল টেক্সটবুকগুলি","nextModule":"পরবর্তী অধ্যায়","oneCourse":"ডিজিটাল টেক্সটবুক","prevModule":"আগের অধ্যায়টি","sectionTitle":"ডিজিটাল টেক্সটবুক","selectChapter":"অধ্যায় নির্বাচন করুন","trainingAttended":"টেক্সটবুকগুলি পড়া হয়েছে","courseContainCertificate":"এই প্রশিক্ষণটির পর আপনাকে একটি শংসাপত্র দেওয়া হবে","courseDontContainCertificate":"বর্তমানে, এই প্রশিক্ষণ কাজটির জন্য কোনও শংসাপত্র দেওয়া হয় না। যে ব্যক্তি প্রশিক্ষণ কাজটির উদ্যোক্তা তিনি পরে একটি শংসাপত্র অ্যাটাচ বা সংযুক্ত করে দিতে পারেন।"},"tab":{"courses":"ডিজিটাল টেক্সটবুক"}},"messages":{"emsg":{"m0002":"এই টেক্সটবুকটি আর পাওয়া যাবে না"},"fmsg":{"dataSettingNotSubmitted":"প্রোফাইল শেয়ার করার সেটিংস আপডেট করা যায়নি।  পরে আবার চেষ্টা করুন","m0001":"দুঃখিত!  আপনি যে টেক্সটবুকটি সন্ধান করেছিলেন তা আমরা পাইনি।  পরে আবার চেষ্টা করুন","m0002":"দুঃখিত!  আমরা আপনার জন্য অন্যান্য টেক্সটবুক পাইনি। পরে আবার চেষ্টা করুন","m0086":"এই টেক্সটবুকটি আর পাওয়া যাবে না"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"টিভিতে সম্প্রচারিত শিক্ষাদানের অনুষ্ঠানগুলি","ACTIVITY_TEXTBOOK_TITLE":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানগুলি","ACTIVITY_TV_CLASS_TITLE":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানগুলি","chapter":"টিভির অনুষ্ঠান","collection_tv_classes":"টিভি ক্লাসগুলি","desktop":{"downloadBook":"টিভিতে সম্প্রচারিত শিক্ষাদানের অনুষ্ঠানগুলি ডাউনলোড করুন","downloadTVclasses":"শিক্ষার্থীদের শিক্ষাদানের উদ্দেশ্যে টিভিতে সম্প্রচারিত অনুষ্ঠানগুলি ডাউনলোড করুন","find_more":"{instance}-এ টিভিতে সম্প্রচারিত আরও শিক্ষণীয় অনুষ্ঠান ও সেই সংক্রান্ত বিষয়বস্তু খুঁজে পান।","find_more_TVclasses":"{instance} এ আরও টিভি ক্লাস এবং সম্পর্কিত বিষয়বস্তু সন্ধান করুন","updateTextbook":"টিভি ক্লাসগুলি আপলোড করুন","updateTVclasses":"টিভিতে সম্প্রচারিত শিক্ষাদানের অনুষ্ঠানগুলি আপডেট করুন"},"downloadBooks":"অফলাইন থাকাকালীন অ্যাকসেস করার জন্য টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানগুলি ডাউনলোড করুন","downloadTVclasses":"টিভি ক্লাস গুলি ডাউনলোড করুন, অফলাইন এ অ্যাকসেস করার জন্য","fromTheTextBook":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানগুলি থেকে","fromTheTVclasses":"টিভির ক্লাস থেকে","noBookfoundTitle":"বোর্ড টিভি ক্লাস যুক্ত করছে","textbooks":"টিভি ক্লাসগুলি","TVclassesfoundTitle":"বোর্ড  টিভি ক্লাস যুক্ত করছে","tv_classes":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানগুলি","tv_program":"টিভির অনুষ্ঠান"}}},"trk":{"frmelmnts":{"btn":{"enroll":"দেখুন","resumecourse":"পুনরায় দেখা শুরু করুন"},"instn":{"t0062":"আপনি এখনও পর্যন্ত এই টিভি ক্লাসের জন্য কোনও প্রশিক্ষণ ব্যাচ তৈরি করেন নি।  একটি ব্যাচ তৈরি করুন এবং ড্যাশবোর্ডটি চেক করুন","t0063":"আপনি এখনও পর্যন্ত টিভিতে কোনও সম্প্রচারযোগ্য শিক্ষণীয় অনুষ্ঠান তৈরি করেননি। টিভিতে সম্প্রচারযোগ্য একটি শিক্ষণীয় অনুষ্ঠান তৈরি করুন এবং ড্যাশবোর্ডটি চেক করুন"},"lbl":{"accessCourse":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানগুলিতে অ্যাকসেস করুন।","accessToLogin":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানগুলিতে  অ্যাক্সেস করতে আপনাকে লগ ইন করতে হবে এবং শিক্ষার্থীদের ব্যাচে যোগদান করতে হবে","ActivityCourses":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানগুলি","ACTIVITY_COURSE_TITLE":"টিভিতে সম্প্রচারিত শিক্ষাদানের অনুষ্ঠানগুলি","addCourse":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানগুলি যোগ করুন","completedCourse":"টিভি ক্লাস সম্পূর্ণ করেছেন","copyAsCourse":"টিভি ক্লাস হিসাবে কপি করুন","courseContainCertificate":"এই প্রশিক্ষণের আপনাকে একটি শংসাপত্র দেওয়া হবে","courseDetails":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানের বিবরণ","courses":"টিভি ক্লাসগুলি","coursestructure":"টিভি অনুষ্ঠান","moduleFinish":"আপনি এই প্রোগ্রামটি সম্পূর্ণ করেছেন","moduleProgress":"অনুষ্ঠান প্রক্রিয়াটির অগ্রগতি","mytrainings":"টিভিতে সম্প্রচারিত আমার প্রয়োজনীয় ও শিক্ষণীয় অনুষ্ঠানগুলি","nextModule":"পরবর্তী অনুষ্ঠান","oneCourse":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠান","prevModule":"পূর্ববর্তী অনুষ্ঠান","sectionTitle":"টিভিতে সম্প্রচারিত শিক্ষাদানের অনুষ্ঠানগুলি","selectChapter":"অনুষ্ঠান নির্বাচন করুন","trainingAttended":"টিভিতে সম্প্রচারিত শিক্ষণীয় অনুষ্ঠানগুলি দেখা হয়েছে","courseDontContainCertificate":"বর্তমানে, এই প্রশিক্ষণ কাজটির জন্য কোনও শংসাপত্র দেওয়া হয় না। যে ব্যক্তি প্রশিক্ষণ কাজটির উদ্যোক্তা তিনি পরে একটি শংসাপত্র অ্যাটাচ বা সংযুক্ত করে দিতে পারেন।"},"tab":{"courses":"টিভিতে সম্প্রচারিত শিক্ষাদানের অনুষ্ঠানগুলি"}},"messages":{"emsg":{"m0002":"এই টিভি ক্লাস টাস্কটি আর পাওয়া যাবে না।"},"fmsg":{"m0001":"দুঃখিত! আপনি যে টিভি ক্লাসগুলির সন্ধান করছিলেন তা আমরা  পাইনি। পরে আবার চেষ্টা করুন","m0002":"দুঃখিত! আমরা আপনার জন্য অন্যান্য টিভি ক্লাস এনে দিতে পারিনি। পরে আবার চেষ্টা করুন","m0086":"টিভিতে সম্প্রচারিত এই শিক্ষণীয় অনুষ্ঠানটি আর পাওয়া যাবে না"}}}}}
\ No newline at end of file
diff --git a/utils/portal/labels/all_labels_en.json b/utils/portal/labels/all_labels_en.json
new file mode 100644
index 000000000..f72420504
--- /dev/null
+++ b/utils/portal/labels/all_labels_en.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"Create"},"lbl":{"ActivityTextbooks":"Tasks","ACTIVITY_TEXTBOOK_TITLE":"Tasks","chapter":"Learning module","collection_task":"Tasks","desktop":{"download":"Download","downloadBook":"Download","find_more":"Find more content","find_more_tasks":"Find more content","update":"Update","updateTextbook":"Update"},"downloadBooks":"Download to access offline","downloadoffline":"Download to access offline","download_to_access_offline":"Download to access offline","fromTheLearningTask":"from the learning task","fromTheTextBook":"from the learning task","import":"Download to access offline","learningmodule":"Learning module","mynotebook":"My Notebook","noBookfoundButtonText":"See more","noBookfoundSubTitle":"Your board is yet to add content. Tap the button to see more content on {instance}","noBookfoundTitle":"Board is adding content","noTaskfoundSubTitle":"Your board is yet to add content. Tap the button to see more content on {instance}","noTaskfoundTitle":"Board is adding content","seemore":"See more","task":"Tasks","tasks":"Tasks","task_title":"Tasks","textbooks":"Tasks"}},"messages":{"stmsg":{"m0125":"Start creating or uploading content. You currently do not have any content saved as a draft","ms0001":"Start creating or uploading content. You currently do not have any content saved as a draft"}}},"trk":{"completed_learning":"Learning completed","essages":{"fmsg":{"m0082":"This learning task is not open, as yet. You cannot join it"}},"frmelmnts":{"btn":{"create":"Create","enroll":"Join","resumecourse":"Resume","unenroll":"Leave","viewcoursestats":"View stats","viewCourseStatsDashboard":"View dashboard"},"instn":{"t0062":"You have not created any batch for this task as yet. Create a task and check the dashboard","t0063":"You have not created any task as yet. Create a new task and check the dashboard again."},"lbl":{"accessCourse":"Access learning material","accessToLogin":"To access the content you have to log in and join the task","ActivityCourses":"Tasks","ACTIVITY_COURSE_TITLE":"Tasks","addCourse":"Add","completedCourse":"Completed Tasks","completingCourseSuccessfully":"For successfully completing learning on,","copyAsCourse":"Copy as learning material","courseContainCertificate":"This learning offers you a certificate","courseDetails":"Learning details","courseProgress":"Progress","courseRelevantFor":"This learning is relevant for:","courses":"Tasks","coursestructure":"Learning module","courseSuccessMessage":"You have successfully completed your learning","courseSuccessNotificationMessage":"You will be informed about your certificate on your registered contact details within 7 days","courseWithoutCertificateNote":"Note: This learning does not offer you a certificate","dashboardnocourseselected":"No selection made","dashboardnocourseselecteddesc":"Select from the list","downloadCourseQRCode":"Download the QR code","downloadQRCode":{"tooltip":"Click to download QR codes and link them to your publication"},"getUnlimitedAccess":"Get unlimited access to textbooks, TV classes and courses offline on your mobile phone","joinTrainingToAcessContent":"To access the content, you have to log in and join the task","moduleFinish":"You have completed this task","moduleProgress":"Task progress","mytrainings":"My tasks","nextModule":"Next task","oneCourse":"Task","prevModule":"Prev. task","returnToCourses":"Back","sectionTitle":"Tasks","selectChapter":"Select task","selectContentFromCourse":"Select contents","trainingAttended":"Learning attended","courseDontContainCertificate":"Currently, this learning task does not have a certificate. The task creator may attach a certificate later"},"tab":{"courses":"Tasks"}},"messages":{"dashboard":{"emsg":{"m002":"User has not joined any batch for this learning task"}},"emsg":{"m0002":"This learning task is no longer available","m0003":"This learning task does not have an open batch"},"fmsg":{"dataSettingNotSubmitted":"Could not update profile share settings. Try again later","m0001":"Sorry! We could not get information for the learning task that you have enrolled for. Try again later","m0002":"Sorry! We could not get other learning tasks for you. Try again later","m0086":"This content is no longer available"},"imsg":{"m0001":"This content has been flagged as inappropriate. It is currently under review","m0026":"Hi, this content is currently unavailable. It may be undergoing change"},"stmsg":{"m0125":"Start creating or uploading content. Currently you have not saved any draft content"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"Courses","ACTIVITY_TEXTBOOK_TITLE":"Courses","chapter":"Course module","desktop":{"downloadBook":"Download course","find_more":"Find more courses and related content on {instance}","updateTextbook":"Update course"},"downloadBooks":"Download courses to access while offline","fromTheTextBook":"from the course","noBookfoundTitle":"Board is adding courses","textbooks":"Courses"}}},"trk":{"completedCourse":"Course completed","frmelmnts":{"btn":{"createCourse":"Create course","enroll":"Join Course","resumecourse":"Resume Course","unenroll":"Leave course","viewcoursestats":"View course stats","viewCourseStatsDashboard":"View course dashboard"},"instn":{"t0062":"You haven't created a batch for this course yet. Create a new batch and check the dashboard again.","t0063":"You have not created any course as yet. Create a new course and check the dashboard again."},"lbl":{"accessCourse":"Access course","accessToLogin":"To access the course you have to log in and join the course","ActivityCourses":"Courses","ACTIVITY_COURSE_TITLE":"Courses","addCourse":"Add course","completedCourse":"Courses completed","completingCourseSuccessfully":"For successfully completing the course,","copyAsCourse":"Copy as course","courseContainCertificate":"This is a certificate course","courseDetails":"Course details","courseDontContainCertificate":"Currently, this course does not have a certificate. The course creator may attach a certificate later.","courseLastUpdatedOn":"Course last updated on","courseProgress":"Course progress","courseRelevantFor":"The course is relevant for:","courses":"Courses","coursestructure":"Course modules","courseSuccessMessage":"You have successfully completed the course","courseSuccessNotificationMessage":"You will be notified about the course certificate on your registered contact details within 7 days","courseWithoutCertificateNote":"Note: This course does not have a certificate","dashboardnocourseselected":"No course selected","dashboardnocourseselecteddesc":"Select a course from the list","downloadCourseQRCode":"Download Course QR Code","downloadQRCode":{"tooltip":"Click to download QR codes and link them to the published course"},"enrollcourse":"Join Course","getUnlimitedAccess":"Get unlimited access to textbooks, lessons and courses offline on your mobile phone","joinTrainingToAcessContent":"You must join the course to get complete access to content","moduleFinish":"You have completed this module","moduleProgress":"Module progress","mytrainings":"My courses","nextModule":"Next module","oneCourse":"Course","prevModule":"Prev. module","returnToCourses":"Return to Courses","sectionTitle":"Courses","selectChapter":"Select module","selectContentFromCourse":"Select contents for course","signinenrollTitle":"Log in to join this course","trainingAttended":"Courses attended","userName":"User name"},"tab":{"courses":"Courses"}},"messages":{"dashboard":{"emsg":{"m002":"The user is not enrolled in any batch of this course"}},"emsg":{"m0002":"The course is not available now","m0003":"This course does not have any open batches"},"fmsg":{"m0001":"Could not fetch enroled courses, try again later","m0002":"Could not fetch other courses, try again later","m0082":"This course is not open for enrolment","m0086":"This course is retired by the author and hence is not available anymore"},"imsg":{"m0001":"This course is flagged as inappropriate and is currently under review.","m0026":"Hi, this course is not available now. It is likely that the creator has made some changes to the course."},"stmsg":{"m0125":"Start creating Resource, Book, Course, Collection or Upload. You have no work-in-progress draft at the moment"}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"Textbooks","ACTIVITY_TEXTBOOK_TITLE":"Textbooks","chapter":"Chapter","copyAsCourse":"Copy as course","desktop":{"deleteCollection":"Deleting {name} textbook removes it from My Downloads. Click Delete to continue.","downloadBook":"Download textbook","find_more":"Find more textbooks and content on {instance}","updateTextbook":"Update textbook"},"dialCodeDescription":"QR code is the 6 digit alphanumeric code found beneath the QR code image in your text book","dialCodeDescriptionGetPage":"QR code is the 6 digit alphanumeric code found beneath the QR code image in your text book.","downloadBooks":"Download books to access while offline","fromTheTextBook":"from the textbook","getUnlimitedAccess":"Get unlimited access to textbooks, lessons and courses offline on your mobile phone","import":"Download books to access while offline","installAppDesc":"Store lessons, textbooks and content offline on your device","mynotebook":"My Notebook","noBookfoundButtonText":"See more books and contents","noBookfoundSubTitle":"Your board is yet to add more books. Tap the button to see more books and content on {instance}","noBookfoundTitle":"Board is adding books","textbooks":"Textbooks"}},"messages":{"stmsg":{"m0125":"Start creating Resource, Book, Course, Collection or Upload. You have no work-in-progress draft at the moment"}}},"trk":{"frmelmnts":{"btn":{"enroll":"Read","resumecourse":"Resume reading","unenroll":"Close"},"instn":{"t0062":"You have not created any learning/reading batch for this textbook as yet. Create a batch and check the dashboard","t0063":"You have not created any textbook as yet. Create a textbook and check the dashboard"},"lbl":{"accessCourse":"Access textbook","accessToLogin":"To access the textbook you have to log in and join the learning/reading batch","ActivityCourses":"Textbook","ACTIVITY_COURSE_TITLE":"Textbook","addCourse":"Add textbook","completedCourse":"Completed textbooks","completingCourseSuccessfully":"For successfully completing learning,","copyAsCourse":"Copy as textbook","courseDetails":"Textbook details","courses":"Textbooks","coursestructure":"Chapter","joinTrainingToAcessContent":"To access the content, you have to join the learning batch","moduleFinish":"You have completed this chapter","moduleProgress":"Chapter progress","mytrainings":"My digital textbooks","nextModule":"Next chapter","oneCourse":"Digital textbook","prevModule":"Prev. chapter","sectionTitle":"Digital textbooks","selectChapter":"Select chapter","trainingAttended":"Textbooks read","courseContainCertificate":"This learning offers you a certificate","courseDontContainCertificate":"Currently, this learning task does not have a certificate. The task creator may attach a certificate later."},"tab":{"courses":"Digital textbook"}},"messages":{"emsg":{"m0002":"This textbook is no longer available"},"fmsg":{"dataSettingNotSubmitted":"Could not update profile share settings. Try again later","m0001":"Sorry! We could not get the textbook you were looking for. Try again later","m0002":"Sorry! We could not get other textbooks for you. Try again later","m0086":"This textbook is not available anymore"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"TV classes","ACTIVITY_TEXTBOOK_TITLE":"TV classes","ACTIVITY_TV_CLASS_TITLE":"TV classes","chapter":"TV program","collection_tv_classes":"TV classes","desktop":{"downloadBook":"Download TV classes","downloadTVclasses":"Download TV classes","find_more":"Find more TV classes and related content on {instance}","find_more_TVclasses":"Find more TV classes and related content on {instance}","updateTextbook":"Update TV classes","updateTVclasses":"Update TV classes"},"downloadBooks":"Download TV classes to access while offline","downloadTVclasses":"Download TV classes to access while offline","fromTheTextBook":"from the TV class","fromTheTVclasses":"from the TV class","noBookfoundTitle":"Board is adding TV class","textbooks":"TV classes","TVclassesfoundTitle":"Board is adding TV class","tv_classes":"TV classes","tv_program":"TV program"}}},"trk":{"frmelmnts":{"btn":{"enroll":"Watch","resumecourse":"Resume watching"},"instn":{"t0062":"You have not created any learning batch for this TV class as yet. Create a batch and check the dashboard","t0063":"You have not created any TV class as yet. Create a TV class and check the dashboard"},"lbl":{"accessCourse":"Access TV classes","accessToLogin":"To access the TV class you have to log in and join the learning batch","ActivityCourses":"TV classes","ACTIVITY_COURSE_TITLE":"TV classes","addCourse":"Add TV class","completedCourse":"Completed TV classes","copyAsCourse":"Copy as TV class","courseContainCertificate":"This learning offers you a certificate","courseDetails":"TV class details","courses":"TV classes","coursestructure":"TV program","moduleFinish":"You have completed this program","moduleProgress":"Program progress","mytrainings":"My TV classes","nextModule":"Next program","oneCourse":"TV class","prevModule":"Prev. program","sectionTitle":"TV classes","selectChapter":"Select program","trainingAttended":"TV classes watched","courseDontContainCertificate":"Currently, this learning task does not have a certificate. The task creator may attach a certificate later"},"tab":{"courses":"TV classes"}},"messages":{"emsg":{"m0002":"This TV class task is no longer available"},"fmsg":{"m0001":"Sorry! We could not get the TV classes you were looking for. Try again later","m0002":"Sorry! We could not get other TV classes for you. Try again later","m0086":"This TV Class is not available anymore"}}}}}
diff --git a/utils/portal/labels/all_labels_gu.json b/utils/portal/labels/all_labels_gu.json
new file mode 100644
index 000000000..9a041430f
--- /dev/null
+++ b/utils/portal/labels/all_labels_gu.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"બનાવો"},"lbl":{"ActivityTextbooks":"કાર્ય","ACTIVITY_TEXTBOOK_TITLE":"કાર્ય","chapter":"શીખવાનું મોડ્યુલ","collection_task":"કાર્ય","desktop":{"download":"ડાઉનલોડ કરો","downloadBook":"ડાઉનલોડ કરો","find_more":"વધુ કન્ટેન્ટ શોધો","find_more_tasks":"વધુ કન્ટેન્ટ શોધો","update":"અપડેટ","updateTextbook":"અપડેટ"},"downloadBooks":"ઑફ્લાઇન એક્સેસ કરવા માટે ડાઉનલોડ કરો","downloadoffline":"ઑફ્લાઇન એક્સેસ કરવા માટે ડાઉનલોડ કરો","download_to_access_offline":"ઑફ્લાઇન એક્સેસ કરવા માટે ડાઉનલોડ કરો","fromTheLearningTask":"શીખવાની ક્રિયા માટેની બેચ","fromTheTextBook":"શીખવાની ક્રિયા માટેની બેચ","import":"ઑફ્લાઇન એક્સેસ કરવા માટે ડાઉનલોડ કરો","learningmodule":"શીખવાનું મોડ્યુલ","mynotebook":"મારી નોટબુક","noBookfoundButtonText":"વધુ જુઓ","noBookfoundSubTitle":"તમારું બોર્ડ હજી કન્ટેન્ટ ઉમેરવા માટે બાકી છે. {instance} પર વધુ  કન્ટેન્ટ જોવા માટે આ બટન દબાવો","noBookfoundTitle":"બોર્ડ કન્ટેન્ટ ઉમેરી રહ્યું છે.","noTaskfoundSubTitle":"તમારું બોર્ડ હજી કન્ટેન્ટ ઉમેરવા માટે બાકી છે. {instance} પર વધુ  કન્ટેન્ટ જોવા માટે આ બટન દબાવો","noTaskfoundTitle":"બોર્ડ કન્ટેન્ટ ઉમેરી રહ્યું છે.","seemore":"વધુ જુઓ","task":"કાર્ય","tasks":"કાર્ય","task_title":"કાર્ય","textbooks":"કાર્ય"}},"messages":{"stmsg":{"m0125":"કન્ટેન્ટ બનાવવા અથવા અપલોડ કરવાનું પ્રારંભ કરો. હાલમાં તમે કોઈપણ ડ્રાફ્ટ કન્ટેન્ટ સાચવી નથી","ms0001":"કન્ટેન્ટ બનાવવા અથવા અપલોડ કરવાનું પ્રારંભ કરો. હાલમાં તમે કોઈપણ ડ્રાફ્ટ કન્ટેન્ટ સાચવી નથી"}}},"trk":{"completed_learning":"ભણવાનું પૂર્ણ થયું","essages":{"fmsg":{"m0082":"આ શીખવાનું કાર્ય હજી સુધી ખુલ્લું નથી. તમે તેમાં જોડાઈ શકતા નથી"}},"frmelmnts":{"btn":{"create":"બનાવો","enroll":"જોડાઓ","resumecourse":"ફરી શરુ કરવું","unenroll":"છોડી દો","viewcoursestats":"આંકડા જુઓ","viewCourseStatsDashboard":"ડેશબોર્ડ જુઓ"},"instn":{"t0062":"તમે હજી સુધી આ કાર્ય માટે કોઈ બેચ બનાવી નથી. એક કાર્ય બનાવો અને ડેશબોર્ડ તપાસો","t0063":"તમે હજી સુધી કોઈ કાર્ય બનાવ્યું નથી. એક નવું કાર્ય બનાવો અને ફરીથી ડેશબોર્ડ તપાસો."},"lbl":{"accessCourse":"શીખવાની સામગ્રી ઍક્સેસ કરો","accessToLogin":"કોર્સને એક્સેસ કરવા માટે તમારે લોગ ઈન કરવું પડશે અને કોર્સમાં જોડાવું પડશે","ActivityCourses":"કાર્ય","ACTIVITY_COURSE_TITLE":"કાર્ય","addCourse":"ઉમેરો","completedCourse":"પૂર્ણ કાર્યો","completingCourseSuccessfully":"સફળતાપૂર્વક અધ્યયન પૂર્ણ કરવા માટે,","copyAsCourse":"શીખવાની સામગ્રી તરીકે કોપી કરો","courseContainCertificate":"આ શિક્ષણ તમને પ્રમાણપત્ર પ્રદાન કરે છે","courseDetails":"વિગતો શીખવી","courseProgress":"પ્રગતિ","courseRelevantFor":"આ શિક્ષણ આના માટે સંબંધિત છે:","courses":"કાર્ય","coursestructure":"શીખવાનું મોડ્યુલ","courseSuccessMessage":"તમે સફળતાપૂર્વક તમારું શિક્ષણ પૂર્ણ કર્યું છે","courseSuccessNotificationMessage":"તમને 7 દિવસની અંદર તમારી નોંધણી કરેલ સંપર્ક વિગતો પર કોર્સ સર્ટિફિકેટ વિશે સૂચિત કરવામાં આવશે","courseWithoutCertificateNote":"નોંધ: આ શિક્ષણ તમને પ્રમાણપત્ર આપતું નથી","dashboardnocourseselected":"કોઈ પસંદગી કરી નથી","dashboardnocourseselecteddesc":"સૂચિમાંથી પસંદ કરો","downloadCourseQRCode":"QR કોડ ડાઉનલોડ કરો","downloadQRCode":{"tooltip":"QR કોડ્સ ડાઉનલોડ કરવા ક્લિક કરો અને તમારું પ્રકાશન સાથે જોડો."},"getUnlimitedAccess":"તમારા મોબાઇલ ફોન પર ઓફલાઇન પાઠ્યપુસ્તકો, ટેલિવિઝન વર્ગો અને કોર્સની અમર્યાદિત એક્સેસ મેળવો.","joinTrainingToAcessContent":"કોર્સને એક્સેસ કરવા માટે તમારે લોગ ઈન કરવું પડશે અને કોર્સમાં જોડાવું પડશે","moduleFinish":"તમે આ કાર્ય પૂર્ણ કર્યું છે","moduleProgress":"કાર્ય પ્રગતિ","mytrainings":"મારા કાર્યો","nextModule":"આગળનું કાર્ય","oneCourse":"કાર્ય","prevModule":"અગાઉનું કાર્ય","returnToCourses":"બેક(પાછળ )","sectionTitle":"કાર્ય","selectChapter":"કાર્ય પસંદ કરો","selectContentFromCourse":"કન્ટેન્ટસ પસંદ કરો","trainingAttended":"અધ્યયનમાં ભાગ લીધો","courseDontContainCertificate":"હાલમાં, આ શીખવાની ક્રિયામાં કોઈ પ્રમાણપત્ર નથી. કાર્ય નિર્માતા પછીથી પ્રમાણપત્ર જોડી શકે છે."},"tab":{"courses":"કાર્ય"}},"messages":{"dashboard":{"emsg":{"m002":"વપરાશકર્તા આ શીખવાની ક્રિયા માટે કોઈપણ બેચમાં જોડાયો નથી"}},"emsg":{"m0002":"આ શીખવાનું કાર્ય હવે ઉપલબ્ધ નથી","m0003":"આ શીખવાની ક્રિયામાં ખુલ્લી બેચ નથી"},"fmsg":{"dataSettingNotSubmitted":"પ્રોફાઇલ શેર સેટિંગ્સને અપડેટ કરી શકીયા નથી. પછીથી ફરી પ્રયાસ કરો","m0001":"માફ કરશો! તમે જે શિક્ષણ કાર્ય માટે નોંધણી કરાવી છે તે વિશેની માહિતી અમે મેળવી શક્યા નહીં. પછીથી ફરી પ્રયાસ કરો","m0002":"માફ કરશો! અમે તમારા માટે અન્ય શીખવાની ક્રિયાઓ મેળવી શક્યા નહીં. પછીથી ફરી પ્રયાસ કરો","m0086":"આ કન્ટેન્ટ હવે ઉપલબ્ધ નથી"},"imsg":{"m0001":"આ સામગ્રીને અયોગ્ય તરીકે ચિહ્નિત કરવામાં આવી છે. હાલમાં તેની સમીક્ષા ચાલી રહી છે","m0026":"હાય, આ સામગ્રી હાલમાં અનુપલબ્ધ છે. તેમાં ફેરફાર થઈ શકે છે"},"stmsg":{"m0125":"કન્ટેન્ટ બનાવવા અથવા અપલોડ કરવાનું પ્રારંભ કરો. હાલમાં તમે કોઈપણ ડ્રાફ્ટ કન્ટેન્ટ સાચવી નથી"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"કોર્સ","ACTIVITY_TEXTBOOK_TITLE":"કોર્સ","chapter":"કોર્સ મોડ્યૂલ","desktop":{"downloadBook":"કોર્સ  ડાઉનલોડ કરો.","find_more":"{instance} પર વધુ કોર્સ અને સંબંધિત કન્ટેન્ટ શોધો","updateTextbook":"સુધારો કોર્સ"},"downloadBooks":"ઑફ્લાઇન હોય ત્યારે એક્સેસ કરવા માટે કોર્સ ડાઉનલોડ કરો","fromTheTextBook":"કોર્સ માંથી","noBookfoundTitle":"બોર્ડ કોર્સ ઉમેરી રહ્યું છે.","textbooks":"કોર્સ"}}},"trk":{"completedCourse":"કોર્સ પૂર્ણ","frmelmnts":{"btn":{"createCourse":"કોર્સ બનાવો","enroll":"કોર્સમાં જોડાઓ","resumecourse":"કોર્સ ફરી શરૂ કરો.","unenroll":"કોર્સ છોડી દો","viewcoursestats":"કોર્સનાં આંકડા જુઓ","viewCourseStatsDashboard":"કોર્સ ડેશબોર્ડ જુઓ"},"instn":{"t0062":"તમે હજી સુધી આ કોર્સ માટે બેચ બનાવી નથી. નવી બેચ બનાવો અને ફરીથી ડેશબોર્ડ તપાસો.","t0063":"તમે હજી સુધી કોઈ કોર્સ બનાવ્યો નથી. નવો કોર્સ બનાવો અને ફરીથી ડેશબોર્ડ તપાસો."},"lbl":{"accessCourse":"એક્સેસ કોર્સ","accessToLogin":"કોર્સ પ્લેયરને એક્સેસ કરવા માટે તમારે લોગ ઈન કરવું પડશે અને તેમાં જોડાવું પડશે","ActivityCourses":"કોર્સ","ACTIVITY_COURSE_TITLE":"કોર્સ","addCourse":"કોર્સ ઉમેરો","completedCourse":"કોર્સ પૂર્ણ","completingCourseSuccessfully":"સફળતાપૂર્વક કોર્સ પૂર્ણ કરવા માટે,","copyAsCourse":"કોર્સ તરીકે કોપિ કરો","courseContainCertificate":"આ કોર્સમાં પ્રમાણપત્ર ઉપલબ્ધ છે","courseDetails":"કોર્સની વિગતો","courseDontContainCertificate":"હાલમાં, આ કોર્સમાં પ્રમાણપત્ર નથી. કોર્સ નિર્માતા પછીથી પ્રમાણપત્ર જોડી શકે છે.\n","courseLastUpdatedOn":"કોર્સ છેલ્લે અપડેટ થયેલ","courseProgress":"કોર્સ પ્રગતિ\n","courseRelevantFor":"કોર્સ આ માટે સંબંધિત છે:","courses":"કોર્સ","coursestructure":"કોર્સ મોડ્યુલ","courseSuccessMessage":"તમે સફળતાપૂર્વક કોર્સ  પૂર્ણ કર્યો છે.","courseSuccessNotificationMessage":"તમને 7 દિવસની અંદર તમારી નોંધણી કરેલ સંપર્ક વિગતો પર કોર્સ સર્ટિફિકેટ વિશે સૂચિત કરવામાં આવશે","courseWithoutCertificateNote":"નોંધ: આ અભ્યાસક્રમમાં પ્રમાણપત્ર નથી","dashboardnocourseselected":"કોઈ કોર્સ પસંદ કરેલ નથી.","dashboardnocourseselecteddesc":"સૂચિમાંથી કોઈ કોર્સ પસંદ કરો.","downloadCourseQRCode":"કોર્સ QR કોડ ડાઉનલોડ કરો.","downloadQRCode":{"tooltip":"QR કોડ્સ ડાઉનલોડ કરવા ક્લિક કરો અને  તેમને પ્રકાશિત કોર્સ સાથે જોડો."},"enrollcourse":"કોર્સમાં જોડાઓ","getUnlimitedAccess":"તમારા મોબાઇલ ફોન પર ઓફલાઇન પાઠ્યપુસ્તકો, પાઠ અને કોર્સની અમર્યાદિત એક્સેસ મેળવો.","joinTrainingToAcessContent":"કન્ટેન્ટનો સંપૂર્ણ એક્સેસ મેળવવા માટે તમારે કોર્સમાં જોડાવું આવશ્યક છે","moduleFinish":"તમે આ મોડ્યુલ સમાપ્ત કર્યું છે","moduleProgress":"મોડ્યુલ પ્રગતિ\n","mytrainings":"મારા કોર્સ","nextModule":"આગળનું મોડ્યુલ","oneCourse":"કોર્સ","prevModule":"અગાઉનું મોડ્યુલ","returnToCourses":"કોર્સ પર પાછા જાઓ","sectionTitle":"કોર્સ","selectChapter":"મોડ્યુલ પસંદ કરો","selectContentFromCourse":"કોર્સ માટે કન્ટેન્ટસ પસંદ કરો","signinenrollTitle":"આ કોર્સમાં જોડાવા માટે લોગ ઇન કરો.","trainingAttended":"કોર્સમાં હાજરી આપી હતી","userName":"વપરાશકર્તાનું નામ"},"tab":{"courses":"કોર્સ"}},"messages":{"dashboard":{"emsg":{"m002":"વપરાશકર્તા આ કોર્સની કોઈપણ બેચમાં નોંધાયેલ નથી"}},"emsg":{"m0002":"કોર્સ હવે અસ્તિત્વમાં નથી","m0003":"આ કોર્સમાં કોઈ ખુલ્લી બેચ નથી"},"fmsg":{"m0001":"નોંધ કરેલ કોર્સ લાવવામાં અસમર્થ, કૃપા કરીને પછીથી ફરી પ્રયાસ કરો .","m0002":"અન્ય કોર્સ લાવવામાં અસમર્થ, કૃપા કરીને પછીથી ફરી પ્રયાસ કરો...","m0082":"આ કોર્સ નોંધણી માટે ઓપન નથી.","m0086":"આ કોર્સને લેખક દ્વારા રોક લગાવાયેલ છે અને તેથી તે હવે ઉપલબ્ધ નથી."},"imsg":{"m0001":"આ કોર્સ અયોગ્ય તરીકે ચિહ્નિત થયેલ છે અને હાલમાં રિવ્યુ હેઠળ છે.","m0026":"હેલો , આ કોર્સ હવે ઉપલબ્ધ નથી. સંભવ છે કે નિર્માતાએ કોર્સમાં કેટલાક ફેરફારો કર્યા છે."},"stmsg":{"m0125":"રિસોર્સ, બુક, કોર્સ, કલેકશન અથવા અપલોડ  બનાવવાનું ચાલુ કરો. અત્યારે તમારી પાસે વર્ક-ઇન-પ્રોગ્રેસ  ડ્રાફ્ટ નથી"}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"પાઠયપુસ્તકો\n","ACTIVITY_TEXTBOOK_TITLE":"પાઠયપુસ્તકો\n","chapter":"પ્રકરણ","copyAsCourse":"કોર્સ તરીકે કોપિ કરો","desktop":{"deleteCollection":"{name} કન્ટેન્ટ ડીલીટ કરવાથી તે મારા ડાઉનલોડ્સથી દૂર થાય છે. ચાલુ રાખવા માટે ડીલીટ પર ક્લિક કરો.","downloadBook":"પાઠયપુસ્તક ડાઉનલોડ કરો","find_more":"{instance} પર વધુ પાઠયપુસ્તક અને કન્ટેન્ટ શોધો","updateTextbook":"પાઠયપુસ્તક અપડેટ કરો"},"dialCodeDescription":"QR કોડ એ 6 અંકનો આલ્ફાન્યુમેરિક કોડ છે જે તમારા પાઠયપુસ્તકમાં QR કોડ ઇમેજની નીચે જોવા મળે છે","dialCodeDescriptionGetPage":"QR કોડ એ 6 અંકનો આલ્ફાન્યુમેરિક કોડ છે જે તમારા પાઠયપુસ્તકમાં QR કોડ ઇમેજની નીચે જોવા મળે છે","downloadBooks":"ઑફ્લાઇન હોય ત્યારે એક્સેસ કરવા માટે પુસ્તકો ડાઉનલોડ કરો","fromTheTextBook":"પાઠયપુસ્તકમાંથી","getUnlimitedAccess":"તમારા મોબાઇલ ફોન પર ઓફલાઇન પાઠ્યપુસ્તકો, પાઠ અને કોર્સની અમર્યાદિત એક્સેસ મેળવો.","import":"ઑફ્લાઇન હોય ત્યારે એક્સેસ કરવા માટે પુસ્તકો ડાઉનલોડ કરો","installAppDesc":"પાઠ, પાઠયપુસ્તકો અને કન્ટેન્ટને તમારા ઉપકરણ પર ઑફ્લાઈન સ્ટોર કરો","mynotebook":"મારી નોટબુક","noBookfoundButtonText":"વધુ પુસ્તકો અને કન્ટેન્ટસ જુઓ","noBookfoundSubTitle":"તમારું બોર્ડ હજી વધુ પુસ્તકો ઉમેરવા માટે બાકી છે. {instance} પર વધુ પુસ્તકો અને કન્ટેન્ટ જોવા માટે આ બટન દબાવો","noBookfoundTitle":"બોર્ડ પુસ્તકો ઉમેરી રહ્યું છે.","textbooks":"પાઠયપુસ્તકો\n"}},"messages":{"stmsg":{"m0125":"રિસોર્સ, બુક, કોર્સ, કલેકશન અથવા અપલોડ  બનાવવાનું ચાલુ કરો. અત્યારે તમારી પાસે વર્ક-ઇન-પ્રોગ્રેસ  ડ્રાફ્ટ નથી"}}},"trk":{"frmelmnts":{"btn":{"enroll":"વાંચો","resumecourse":"વાંચન ફરી શરૂ કરો","unenroll":"બંધ કરો"},"instn":{"t0062":"તમે હજી સુધી આ પાઠયપુસ્તક માટે કોઈ શીખવાની / વાંચવાની બેચ બનાવી નથી. એક બેચ બનાવો અને ડેશબોર્ડ તપાસો","t0063":"તમે હજી સુધી કોઈપાઠયપુસ્તક બનાવ્યો નથી. નવો પાઠયપુસ્તક બનાવો અને ફરીથી ડેશબોર્ડ તપાસો."},"lbl":{"accessCourse":"પાઠયપુસ્તક ઍક્સેસ કરો","accessToLogin":"પાઠયપુસ્તકને એક્સેસ કરવા માટે તમારે લોગ  ઇન કરવું પડશે અને ભણતર / વાંચન બેચમાં જોડાવું પડશે","ActivityCourses":"પાઠયપુસ્તક","ACTIVITY_COURSE_TITLE":"પાઠયપુસ્તક","addCourse":"પાઠયપુસ્તક ઉમેરો","completedCourse":"પાઠયપુસ્તકો પૂર્ણ","completingCourseSuccessfully":"સફળતાપૂર્વક અધ્યયન પૂર્ણ કરવા માટે,","copyAsCourse":"પાઠયપુસ્તક તરીકે કોપિ કરો","courseDetails":"પાઠયપુસ્તક વિગતો","courses":"પાઠયપુસ્તકો\n","coursestructure":"પ્રકરણ","joinTrainingToAcessContent":"કન્ટેન્ટને એક્સેસ કરવા માટે, તમારે શીખવાની બેચમાં જોડાવું પડશે","moduleFinish":"તમે આ પ્રકરણ પૂર્ણ કર્યું છે","moduleProgress":"પ્રકરણ પ્રગતિ\n","mytrainings":"મારા ડિજિટલ પાઠયપુસ્તકો","nextModule":"આગળનું પ્રકરણ","oneCourse":"ડિજિટલ પાઠયપુસ્તક","prevModule":"અગાઉનું પ્રકરણ","sectionTitle":"ડિજિટલ પાઠયપુસ્તકો","selectChapter":"પ્રકરણ પસંદ કરો","trainingAttended":"પાઠયપુસ્તકો વાંચ્યા","courseContainCertificate":"આ શિક્ષણ તમને પ્રમાણપત્ર પ્રદાન કરે છે","courseDontContainCertificate":"હાલમાં, આ શીખવાની ક્રિયામાં કોઈ પ્રમાણપત્ર નથી. કાર્ય નિર્માતા પછીથી પ્રમાણપત્ર જોડી શકે છે."},"tab":{"courses":"ડિજિટલ પાઠયપુસ્તક"}},"messages":{"emsg":{"m0002":"આ પાઠયપુસ્તકો હવે ઉપલબ્ધ નથી"},"fmsg":{"dataSettingNotSubmitted":"પ્રોફાઇલ શેર સેટિંગ્સને અપડેટ કરી શકી નથી. પછીથી ફરી પ્રયાસ કરો","m0001":"માફ કરશો! તમે જે પાઠયપુસ્તક શોધી રહ્યા હતા તે અમે મેળવી શક્યા નહીં. પછીથી ફરી પ્રયાસ કરો","m0002":"માફ કરશો! અમે તમારા માટે અન્ય પાઠયપુસ્તકો મેળવી શક્યા નહીં. પછીથી ફરી પ્રયાસ કરો","m0086":"આ પાઠયપુસ્તકો હવે ઉપલબ્ધ નથી"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"ટેલિવિઝન વર્ગો","ACTIVITY_TEXTBOOK_TITLE":"ટેલિવિઝન વર્ગો","ACTIVITY_TV_CLASS_TITLE":"ટેલિવિઝન વર્ગો","chapter":"ટેલિવિઝન કાર્યક્રમો","collection_tv_classes":"ટેલિવિઝન વર્ગો","desktop":{"downloadBook":"ડાઉનલોડ ટેલિવિઝન વર્ગો","downloadTVclasses":"ડાઉનલોડ ટેલિવિઝન વર્ગો","find_more":"{instance} પર વધુ ટેલિવિઝન વર્ગો અને સંબંધિત કન્ટેન્ટ શોધો.","find_more_TVclasses":"{instance} પર વધુ ટેલિવિઝન  વર્ગો અને સંબંધિત કન્ટેન્ટ શોધો.","updateTextbook":"અપડેટ ટેલિવિઝન વર્ગો","updateTVclasses":"અપડેટ ટેલિવિઝન વર્ગો"},"downloadBooks":"ઑફ્લાઇન હોય ત્યારે એક્સેસ કરવા માટે ટેલિવિઝન વર્ગો ડાઉનલોડ કરો","downloadTVclasses":"ઑફ્લાઇન હોય ત્યારે એક્સેસ કરવા માટે ટેલિવિઝન વર્ગો ડાઉનલોડ કરો","fromTheTextBook":"ટેલિવિઝન વર્ગ માંથી","fromTheTVclasses":"ટેલિવિઝન વર્ગ માંથી","noBookfoundTitle":"બોર્ડ ટેલિવિઝન વર્ગો ઉમેરી રહ્યું છે.","textbooks":"ટેલિવિઝન વર્ગો","TVclassesfoundTitle":"બોર્ડ ટેલિવિઝન વર્ગો ઉમેરી રહ્યું છે.","tv_classes":"ટેલિવિઝન વર્ગો","tv_program":"ટેલિવિઝન કાર્યક્રમો"}}},"trk":{"frmelmnts":{"btn":{"enroll":"જુઓ","resumecourse":"જોવાનું ફરી શરૂ કરો"},"instn":{"t0062":"તમે હજી સુધી આ ટેલિવિઝન વર્ગો માટે કોઈ શીખવાની બેચ બનાવી નથી. એક બેચ બનાવો અને ડેશબોર્ડ તપાસો","t0063":"તમે હજી સુધી કોઈ ટેલિવિઝન વર્ગો બનાવ્યો નથી. નવો ટેલિવિઝન વર્ગો બનાવો અને ફરીથી ડેશબોર્ડ તપાસો."},"lbl":{"accessCourse":"ટેલિવિઝન વર્ગો ઍક્સેસ કરો","accessToLogin":"ટેલિવિઝન વર્ગને એક્સેસ કરવા માટે તમારે લોગ ઇન કરવું પડશે અને શીખવાની બેચમાં જોડાવું પડશે","ActivityCourses":"ટેલિવિઝન વર્ગો","ACTIVITY_COURSE_TITLE":"ટેલિવિઝન વર્ગો","addCourse":"ટેલિવિઝન વર્ગ ઉમેરો","completedCourse":"પૂર્ણ કરેલા ટેલિવિઝન વર્ગો","copyAsCourse":"ટેલિવિઝન વર્ગ તરીકે કોપિ કરો","courseContainCertificate":"આ અભ્યાસ તમને પ્રમાણપત્ર આપે છે","courseDetails":"ટેલિવિઝન વર્ગોની વિગતો","courses":"ટેલિવિઝન વર્ગો","coursestructure":"ટેલિવિઝન કાર્યક્રમો","moduleFinish":"તમે આ પ્રોગ્રામ પૂર્ણ કર્યો છે","moduleProgress":"કાર્યક્રમની પ્રગતિ","mytrainings":"મારા ટેલિવિઝન વર્ગો","nextModule":"આગળનો કાર્યક્રમ","oneCourse":"ટેલિવિઝન વર્ગ","prevModule":"અગાઉના કાર્યક્રમ","sectionTitle":"ટેલિવિઝન વર્ગો","selectChapter":"કાર્યક્ર પસંદ કરો","trainingAttended":"ટેલિવિઝન વર્ગો જોયા છે","courseDontContainCertificate":"હાલમાં, આ શીખવાની ક્રિયામાં કોઈ પ્રમાણપત્ર નથી. કાર્ય નિર્માતા પછીથી પ્રમાણપત્ર જોડી શકે છે."},"tab":{"courses":"ટેલિવિઝન વર્ગો"}},"messages":{"emsg":{"m0002":"આ ટેલિવિઝન વર્ગનું કાર્ય હવે ઉપલબ્ધ નથી"},"fmsg":{"m0001":"માફ કરશો! તમે જે ટેલિવિઝન વર્ગો શોધી રહ્યા હતા તે અમે મેળવી શક્યા નહીં. પછીથી ફરી પ્રયાસ કરો","m0002":"માફ કરશો! અમે તમારા માટે અન્ય ટેલિવિઝન વર્ગ મેળવી શક્યા નથી. પછીથી ફરી પ્રયાસ કરો","m0086":"આ ટેલિવિઝન વર્ગ હવે ઉપલબ્ધ નથી"}}}}}
\ No newline at end of file
diff --git a/utils/portal/labels/all_labels_hi.json b/utils/portal/labels/all_labels_hi.json
new file mode 100644
index 000000000..8d61d43f2
--- /dev/null
+++ b/utils/portal/labels/all_labels_hi.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"निर्माण करें"},"lbl":{"ActivityTextbooks":"कार्य","ACTIVITY_TEXTBOOK_TITLE":"कार्य","chapter":"अभ्यास मॉड्यूल","collection_task":"कार्य","desktop":{"download":"डाउनलोड","downloadBook":"डाउनलोड","find_more":"अधिक कंटेंट खोजें","find_more_tasks":"अधिक कंटेंट खोजें","update":"अद्यतित करें","updateTextbook":"अद्यतित करें"},"downloadBooks":"ऑफ़लाइन अभिगम के लिए डाउनलोड करें","downloadoffline":"ऑफ़लाइन अभिगम के लिए डाउनलोड करें","download_to_access_offline":"ऑफ़लाइन अभिगम के लिए डाउनलोड करें","fromTheLearningTask":"अभ्यास कार्य से","fromTheTextBook":"अभ्यास कार्य से","import":"ऑफ़लाइन अभिगम के लिए डाउनलोड करें","learningmodule":"अध्ययन मॉड्यूल","mynotebook":"मेरी किताब","noBookfoundButtonText":"और देखें","noBookfoundSubTitle":"आपके बोर्ड में सामग्री जोड़ना बाकी है। {instance} पर अधिक सामग्री देखने के लिए बटन पर क्लिक करें","noBookfoundTitle":"बोर्ड द्वारा कंटेन्ट जोड़ा जा रहा है","noTaskfoundSubTitle":"आपके बोर्ड में कंटेन्ट जोड़ना बाकी है। {instance} पर अधिक कंटेन्ट देखने के लिए बटन पर क्लिक करें","noTaskfoundTitle":"बोर्ड कंटेन्ट जोड़ रहा है","seemore":"और देखें","task":"कार्य","tasks":"कार्य","task_title":"कार्य","textbooks":"कार्य"}},"messages":{"stmsg":{"m0125":"कंटेन्ट बनाना या अपलोड करना प्रारंभ करें। फिलहाल आपके पास किसी भी कंटेन्ट को ड्राफ्ट  के रूप में सहेजा नहीं गया है","ms0001":"कंटेन्ट बनाना या अपलोड करना प्रारंभ करें। फिलहाल आपके किसी भी कंटेन्ट को ड्राफ्ट  के रूप में सहेजा नहीं गया है"}}},"trk":{"completed_learning":"अभ्यास पूर्ण हुआ","essages":{"fmsg":{"m0082":"यह अभ्यास कार्य अभी तक खुला नहीं है। आप इसमें शामिल नहीं हो सकते"}},"frmelmnts":{"btn":{"create":"निर्माण करें","enroll":"नामांकन करें","resumecourse":"फिर से आरंभ करें","unenroll":"छोड़े","viewcoursestats":"सांख्यिकीय देखें","viewCourseStatsDashboard":"डैशबोर्ड देखें"},"instn":{"t0062":"आपने अभी तक इस कार्य के लिए कोई बैच नहीं बनाई है। नया कार्य बनाएँ और डैशबोर्ड देखें","t0063":"आपने अभी तक कोई कार्य नहीं बनाया है। नया कार्य बनाएँ और दोबारा डैशबोर्ड देखें।"},"lbl":{"accessCourse":"अभ्यास सामग्री का अभिगम करें","accessToLogin":"कंटेन्ट के अभिगम के लिए आपको लॉग इन कर, कोर्स में शामिल होना होगा","ActivityCourses":"कार्य","ACTIVITY_COURSE_TITLE":"कार्य","addCourse":"जोड़े","completedCourse":"कार्य पूर्ण हुआ","completingCourseSuccessfully":"सफलतापूर्वक अभ्यास को पूरा करने के लिए,","copyAsCourse":"अध्ययन सामग्री के रूप मे कॉपी करें","courseContainCertificate":"यह अध्ययन आपको प्रमाणपत्र प्रदान करता है","courseDetails":"अध्ययन का विवरण","courseProgress":"प्रगति","courseRelevantFor":"यह अध्ययन प्रासंगिक हैं:","courses":"कार्य","coursestructure":"अध्ययन मॉड्यूल","courseSuccessMessage":"आपने अपना अध्ययन सफलतापूर्वक पूर्ण किया हैं","courseSuccessNotificationMessage":"आपको ७ दिनों के भीतर अपने पंजीकृत संपर्क विवरण पर आपके प्रमाण पत्र के बारे में सूचित किया जाएगा","courseWithoutCertificateNote":"टिप्पणी: यह अध्ययन आपको प्रमाण पत्र प्रदान नहीं करता है","dashboardnocourseselected":"कोई चयन नहीं हुआ","dashboardnocourseselecteddesc":"सूची से चुनिए","downloadCourseQRCode":"QR कोड डाउनलोड करें","downloadQRCode":{"tooltip":"QR कोड डाउनलोड करने के लिये क्लिक करें और प्रकाशित कंटेन्ट से लिंक करें"},"getUnlimitedAccess":"अपने मोबाइल पर पाठ्यपुस्तकों, टीवी क्लास और कोर्स का असीमित अभिगम प्राप्त करें","joinTrainingToAcessContent":"कंटेन्ट के अभिगम के लिए आपको लॉग इन कर, कार्य में शामिल होना होगा","moduleFinish":"आपने यह कार्य पूर्ण किया है","moduleProgress":"कार्य की प्रगति","mytrainings":"मेरे कार्य","nextModule":"अगला कार्य","oneCourse":"कार्य","prevModule":"पिछला कार्य","returnToCourses":"पीछे","sectionTitle":"कार्य","selectChapter":"कार्य चुनिए","selectContentFromCourse":"कंटेन्ट का चयन करें","trainingAttended":"अध्ययन मे भाग लिया","courseDontContainCertificate":"फिलहाल इस कोर्स में प्रमाण-पत्र नहीं है| कोर्स निर्माता बाद में प्रमाण पत्र संलग्न कर सकता है।"},"tab":{"courses":"कार्य"}},"messages":{"dashboard":{"emsg":{"m002":"इस अभ्यास कार्य के लिए उपयोगकर्ता किसी भी बैच में शामिल नहीं हुआ है"}},"emsg":{"m0002":"यह अभ्यास कार्य अब उपलब्ध नहीं है","m0003":"इस अभ्यास कार्य में चलित बैच नहीं है"},"fmsg":{"dataSettingNotSubmitted":"प्रोफ़ाइल साझाकरण सेटिंग अद्यतित नहीं की जा सकी। पुन: प्रयास करें","m0001":"क्षमा करें! नामांकित  शिक्षण कार्य की जानकारी लाने में असमर्थ, पुनः प्रयास करें","m0002":"क्षमा करें! हम आपके लिए अन्य  अभ्यास कार्य प्राप्त नहीं कर सके। पुनः प्रयास करें","m0086":"यह कंटेन्ट अब उपलब्ध नहीं है"},"imsg":{"m0001":"इस सामग्री को अनुपयुक्त चिह्नित किया गया है। फिलहाल इसकी समीक्षा चल रही है","m0026":"नमस्ते, यह कंटेन्ट वर्तमान में अनुपलब्ध है। इसमें बदलाव किया जा रहा है"},"stmsg":{"m0125":"कंटेन्ट बनाना या अपलोड करना प्रारंभ करें। वर्तमान में आपने कोई ड्राफ्ट कंटेन्ट नहीं सहेजी है"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"कोर्स","ACTIVITY_TEXTBOOK_TITLE":"कोर्स","chapter":"कोर्स मॉड्यूल","desktop":{"downloadBook":"कोर्स डाउनलोड करें","find_more":"{instance} पर अधिक कोर्स और संबंधित कंटेन्ट ढूंढें","updateTextbook":"कोर्स अद्यतित करें"},"downloadBooks":"ऑफ़लाइन अभिगम के लिए कोर्स को डाउनलोड करें","fromTheTextBook":"कोर्स से","noBookfoundTitle":"बोर्ड कोर्स जोड़ रहा है","textbooks":"कोर्स"}}},"trk":{"completedCourse":"कोर्स पूर्ण हुआ","frmelmnts":{"btn":{"createCourse":"कोर्स बनाएं","enroll":"कोर्स मे भाग लिजिए","resumecourse":"कोर्स  पुनः आरंभ करें","unenroll":"कोर्स छोड़े","viewcoursestats":"कोर्स सांख्यिकीय देखें","viewCourseStatsDashboard":"कोर्स डैशबोर्ड देखें"},"instn":{"t0062":"आपने इस कोर्स के लिए बैच नहीं बनाया है। बैच निर्मित करें व पुनः अपने डैशबोर्ड की जाँच करें।","t0063":"आपने अभी तक कोई कोर्स नहीं बनाया है। नया कोर्स बनाए और दोबारा डैशबोर्ड देखें।"},"lbl":{"accessCourse":"कोर्स का अभिगम","accessToLogin":"कोर्स के अभिगम के लिए आपको लॉग इन कर, कोर्स में शामिल होना होगा","ActivityCourses":"कोर्स","ACTIVITY_COURSE_TITLE":"कोर्स","addCourse":"कोर्स जोड़े","completedCourse":"कोर्स पूर्ण हुआ","completingCourseSuccessfully":"कोर्स सफलतापूर्वक पूर्ण हुआ","copyAsCourse":"कोर्स के रूप में कॉपी करें","courseContainCertificate":"इस कोर्स में सर्टिफिकेट उपलब्ध है","courseDetails":"कोर्स विवरण","courseDontContainCertificate":"फिलहाल इस कोर्स में प्रमाण-पत्र नहीं है|  कोर्स निर्माता बाद में प्रमाण पत्र संलग्न कर सकता है।","courseLastUpdatedOn":"कोर्स की अंतिम अद्यतन तारीख","courseProgress":"कोर्स प्रगति","courseRelevantFor":"यह कोर्स प्रासंगिक हैं:","courses":"कोर्स","coursestructure":"कोर्स मॉड्यूल","courseSuccessMessage":"आपने कोर्स सफलतापूर्वक पूर्ण किया हैं","courseSuccessNotificationMessage":"प्रमाण पत्र संबंधित सूचना आपके पंजीकृत संपर्क विवरण मे ७ दिनों के भीतर भेजी जाएगी","courseWithoutCertificateNote":"टिप्पणी: इस कोर्स में प्रमाण पत्र नहीं है","dashboardnocourseselected":"कोई कोर्स नहीं चुना है","dashboardnocourseselecteddesc":"सूची से कोर्स चुनिए","downloadCourseQRCode":"कोर्स का QR कोड डाउनलोड करें","downloadQRCode":{"tooltip":"QR कोड डाउनलोड करने के लिये क्लिक करें और प्रकाशित कोर्स से लिंक करें"},"enrollcourse":"कोर्स में नामांकन कीजिये","getUnlimitedAccess":"अपने मोबाइल पर पाठ्यपुस्तकों, पाठों और कोर्स का असीमित अभिगम प्राप्त करें","joinTrainingToAcessContent":"पूरे कंटेन्ट का अभिगम करने के लिए कोर्स में शामिल होना होगा","moduleFinish":"आपने यह मॉड्यूल पूर्ण कर लिया हैं","moduleProgress":"मॉड्यूल की प्रगति","mytrainings":"मेरे कोर्स","nextModule":"अगला मॉड्यूल","oneCourse":"कोर्स","prevModule":"पिछला मॉड्यूल","returnToCourses":"कोर्स पर जायें","sectionTitle":"कोर्स","selectChapter":"मॉड्यूल चुनिये","selectContentFromCourse":"कोर्स के लिए कंटेन्ट का चयन करें","signinenrollTitle":"कोर्स में नामांकन हेतु लॉग इन करें","trainingAttended":"कोर्स में भाग लिया","userName":"उपयोगकर्ता का नाम"},"tab":{"courses":"कोर्स"}},"messages":{"dashboard":{"emsg":{"m002":"उपयोगकर्ता इस पाठ्यक्रम के किसी भी बैच में नामांकित नहीं है"}},"emsg":{"m0002":"यह कोर्स अभी उपलब्ध नहीं है","m0003":"इस कोर्स में कोई चलित बैच नहीं है"},"fmsg":{"m0001":"नामांकित कोर्स लाने में असमर्थ, पुनः प्रयास करें","m0002":"कोर्स लाने में असमर्थ, पुनः प्रयास करें","m0082":"यह कोर्स नामांकन के लिये उपलब्ध नहीं है","m0086":"यह कोर्स रचयिता द्वारा निवृत्त करने के कारण उपलब्ध नहीं है"},"imsg":{"m0001":"यह कोर्स अनुचित फ्लैग होने के कारण निरिक्षण में है।","m0026":"नमस्ते, फिलहाल यह कोर्स उपलब्ध नहीं है। शायद कोर्स रचियता ने कोर्स में परिवर्तन किया है"},"stmsg":{"m0125":"संसाधन, पुस्तक, कोर्स, या कलेक्शन अपलोड कीजिये। फिलहाल आपका कोई भी प्रालेख उपलब्ध नहीं है।"}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"पाठ्यपुस्तकें","ACTIVITY_TEXTBOOK_TITLE":"पाठ्यपुस्तकें","chapter":"अध्याय","copyAsCourse":"कोर्स के रूप में कॉपी करें","desktop":{"deleteCollection":"{name} पाठ्यपुस्तक हटाने पर यह डाउनलोड फ़ोल्डर से भी हटा दिया जायेंगा| जारी रखने के लिए हटाएं बटन पर क्लिक करें।","downloadBook":"पाठ्यपुस्तक डाउनलोड करें","find_more":"{instance} पर अधिक पुस्तकें और कंटेंट ढूंढें","updateTextbook":"पाठ्यपुस्तक अद्यतित करें"},"dialCodeDescription":"QR कोड ६ वर्णाक्षर का मेल होता है, जो आपकी पाठ्यपुस्तक के QR कोड की छवि के नीचे छपा है","dialCodeDescriptionGetPage":"QR कोड ६ वर्णाक्षर का मेल होता है, जो आपकी पाठ्यपुस्तक के QR कोड की छवि के नीचे छपा है","downloadBooks":"ऑफ़लाइन रहते हुए अभिगम के लिए पुस्तकों को डाउनलोड करें","fromTheTextBook":"पाठ्यपुस्तक से","getUnlimitedAccess":"अपने मोबाइल पर पाठ्यपुस्तकों, पाठों और कोर्स का असीमित अभिगम प्राप्त करें","import":"ऑफ़लाइन रहते हुए अभिगम के लिए पुस्तकों को डाउनलोड करें","installAppDesc":"अपने डिवाइस पर पाठ, पाठ्यपुस्तकों और कंटेन्ट को ऑफ़लाइन सहेजे","mynotebook":"मेरी किताब","noBookfoundButtonText":"अधिक पुस्तकें और कंटेंट देखे","noBookfoundSubTitle":"आपके बोर्ड में अभी और किताबें नहीं हैं। {instance} पर अधिक पुस्तकें और कंटेन्ट देखने के लिए बटन पर क्लिक करें","noBookfoundTitle":"बोर्ड द्वारा पुस्तकें जोड़ी जा रही हैं","textbooks":"पाठ्यपुस्तकें"}},"messages":{"stmsg":{"m0125":"संसाधन, पुस्तक, कोर्स, या कलेक्शन अपलोड कीजिये। फिलहाल आपका कोई भी प्रालेख उपलब्ध नहीं है।"}}},"trk":{"frmelmnts":{"btn":{"enroll":"पढ़े","resumecourse":"पुनः पढ़ना शुरू करें","unenroll":"समाप्त"},"instn":{"t0062":"आपने इस पाठ्यपुस्तक के लिए अभी तक अध्ययन बैच नहीं बनाया है। एक बैच बनाएं और डैशबोर्ड की जांच करें","t0063":"आपने अभी तक कोई पाठ्यपुस्तक नहीं बनाई है। नई पाठ्यपुस्तक बनाएँ और डैशबोर्ड देखें।"},"lbl":{"accessCourse":"पाठ्यपुस्तक का अभिगम करें","accessToLogin":"पाठ्यपुस्तक का अभिगम करने के लिए आपको लॉग इन करना होगा और लर्निंग / रीडिंग बैच से जुड़ना होगा","ActivityCourses":"पाठ्यपुस्तक","ACTIVITY_COURSE_TITLE":"पाठ्यपुस्तक","addCourse":"पाठ्यपुस्तक जोड़ें","completedCourse":"आपके द्वारा पूर्ण पाठ्यपुस्तकें","completingCourseSuccessfully":"सफलतापूर्वक अभ्यास को पूरा करने के लिए,","copyAsCourse":"पाठ्यपुस्तक के रूप में कॉपी करें","courseDetails":"पाठ्यपुस्तक विवरण","courses":"पाठ्यपुस्तकें","coursestructure":"अध्याय","joinTrainingToAcessContent":"कंटेन्ट तक पहुंचने के लिए, आपको अभ्यास बैच में शामिल होना होगा","moduleFinish":"आपने यह अध्याय पूर्ण किया है","moduleProgress":"अध्याय की प्रगति","mytrainings":"मेरी डिजिटल पाठ्यपुस्तकें","nextModule":"अगला अध्याय","oneCourse":"डिजिटल पाठ्यपुस्तक","prevModule":"पिछला अध्याय","sectionTitle":"डिजिटल पाठ्यपुस्तकें","selectChapter":"अध्याय चुनिए","trainingAttended":"पढ़ी हुई पाठ्यपुस्तकें","courseContainCertificate":"यह अध्ययन आपको प्रमाणपत्र प्रदान करता है","courseDontContainCertificate":"फिलहाल इस कोर्स में प्रमाणपत्र नहीं है| कोर्स निर्माता बाद में प्रमाण-पत्र संलग्न कर सकता है।"},"tab":{"courses":"डिजिटल पाठ्यपुस्तक"}},"messages":{"emsg":{"m0002":"यह पाठ्यपुस्तक अब उपलब्ध नहीं है"},"fmsg":{"dataSettingNotSubmitted":"प्रोफ़ाइल साझाकरण सेटिंग अद्यतित नहीं की जा सकी। पुन: प्रयास करें","m0001":"क्षमा करें! हम वह पाठ्यपुस्तक नहीं ला सके जिसे आप ढूंढ रहे थे। पुनः प्रयास करें","m0002":"क्षमा करें! हम आपके लिए अन्य पाठ्यपुस्तकें नहीं प्राप्त कर सके। पुनः प्रयास करें","m0086":"यह पाठ्यपुस्तक अब उपलब्ध नहीं है"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"टीवी कक्षाएँ","ACTIVITY_TEXTBOOK_TITLE":"टीवी कक्षाएँ","ACTIVITY_TV_CLASS_TITLE":"टीवी कक्षाएँ","chapter":"टीवी कार्यक्रम","collection_tv_classes":"टीवी कक्षाएँ","desktop":{"downloadBook":"टीवी कक्षाएँ डाउनलोड करें","downloadTVclasses":"टीवी कक्षाएं डाउनलोड करें","find_more":"{instance} पर अधिक टीवी कक्षाएं और संबंधित कंटेन्ट खोजें","find_more_TVclasses":"{instance} पर अधिक टीवी कक्षाएं और संबंधित कंटेन्ट खोजें","updateTextbook":"टीवी कक्षाएँ अद्यतित करें","updateTVclasses":"टीवी कक्षाएँ अद्यतित करें"},"downloadBooks":"ऑफ़लाइन अभिगम के लिए टीवी कक्षाएं डाउनलोड करें","downloadTVclasses":"ऑफ़लाइन अभिगम के लिए टीवी कक्षाएं डाउनलोड करें","fromTheTextBook":"टीवी कक्षा से","fromTheTVclasses":"टीवी क्लास से","noBookfoundTitle":"बोर्ड द्वारा टीवी कक्षाएँ जोड़ी जा रही हैं","textbooks":"टीवी कक्षाएँ","TVclassesfoundTitle":"बोर्ड द्वारा टीवी कक्षाएँ जोड़ी जा रही हैं","tv_classes":"टीवी कक्षाएँ","tv_program":"टीवी कार्यक्रम"}}},"trk":{"frmelmnts":{"btn":{"enroll":"देखें","resumecourse":"पुनः देखना शुरू करें"},"instn":{"t0062":"आपने अभी तक इस टीवी वर्ग के लिए कोई अध्ययन बैच नहीं बनाया है। बैच बनाएँ और डैशबोर्ड की जांच करें","t0063":"आपने अभी तक कोई टीवी क्लास नहीं बनाई है। नई टीवी क्लास बनाए और डैशबोर्ड देखें।"},"lbl":{"accessCourse":"टीवी कक्षाओं का अभिगम करें","accessToLogin":"टीवी कक्षाओं के अभिगम के लिए आपको लॉग इन कर अभ्यास बैच में शामिल होना होगा","ActivityCourses":"टीवी कक्षाएँ","ACTIVITY_COURSE_TITLE":"टीवी कक्षाएँ","addCourse":"टीवी कक्षा जोड़ें","completedCourse":"पूर्ण टीवी कक्षाएँ","copyAsCourse":"टीवी कक्षा के रूप मे कॉपी करें","courseContainCertificate":"यह अध्ययन आपको प्रमाणपत्र प्रदान करता है","courseDetails":"टीवी क्लास विवरण","courses":"टीवी कक्षाएँ","coursestructure":"टीवी कार्यक्रम","moduleFinish":"आपने यह कार्यक्रम पूर्ण किया है","moduleProgress":"कार्यक्रम की प्रगति","mytrainings":"मेरी टीवी कक्षाएँ","nextModule":"अगला कार्यक्रम","oneCourse":"टीवी कक्षा","prevModule":"पिछला कार्यक्रम","sectionTitle":"टीवी कक्षाएँ","selectChapter":"कार्यक्रम चुनिए","trainingAttended":"आपके द्वारा देखी गयी टीवी कक्षाएँ","courseDontContainCertificate":"फिलहाल इस कोर्स में प्रमाणपत्र नहीं है| कोर्स निर्माता बाद में प्रमाण-पत्र संलग्न कर सकता है।"},"tab":{"courses":"टीवी कक्षाएँ"}},"messages":{"emsg":{"m0002":"यह टीवी कक्षा कार्य अब उपलब्ध नहीं है"},"fmsg":{"m0001":"क्षमा करें! हम वह टीवी कक्षा नहीं ला सके जिसे आप ढूंढ रहे थे। पुनः प्रयास करें","m0002":"क्षमा करें! हम आपके लिए अन्य टीवी कक्षाएँ प्राप्त नहीं कर सके। पुनः प्रयास करें","m0086":"यह टीवी क्लास अब उपलब्ध नहीं है"}}}}}
diff --git a/utils/portal/labels/all_labels_kn.json b/utils/portal/labels/all_labels_kn.json
new file mode 100644
index 000000000..a30355af4
--- /dev/null
+++ b/utils/portal/labels/all_labels_kn.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"ರಚಿಸಿ"},"lbl":{"ActivityTextbooks":"ಟಾಸ್ಕ್ ಗಳು","ACTIVITY_TEXTBOOK_TITLE":"ಟಾಸ್ಕ್ ಗಳು","chapter":"ಕಲಿಕಾ ಮಾಡ್ಯೂಲ್","collection_task":"ಟಾಸ್ಕ್ ಗಳು","desktop":{"download":"ಡೌನ್ಲೋಡ್","downloadBook":"ಡೌನ್ಲೋಡ್","find_more":"ಇನ್ನೂ ಹೆಚ್ಚು ಪಠ್ಯಾಂಶ ನೋಡಿ","find_more_tasks":"ಇನ್ನೂ ಹೆಚ್ಚು ಪಠ್ಯಾಂಶ ನೋಡಿ","update":"ಅಪ್ ಡೇಟ್","updateTextbook":"ಅಪ್ ಡೇಟ್"},"downloadBooks":"ಆಫ್ಲೈನ್ ಲಭ್ಯತೆಗೆ ಡೌನ್ಲೋಡ್ ಮಾಡಿ","downloadoffline":"ಆಫ್ಲೈನ್ ಲಭ್ಯತೆಗೆ ಡೌನ್ಲೋಡ್ ಮಾಡಿ","download_to_access_offline":"ಆಫ್ಲೈನ್ ಲಭ್ಯತೆಗೆ ಡೌನ್ಲೋಡ್ ಮಾಡಿ","fromTheLearningTask":"ಕಲಿಕಾ ಟಾಸ್ಕ್ ನಿಂದ","fromTheTextBook":"ಕಲಿಕಾ ಟಾಸ್ಕ್  ನಿಂದ","import":"ಆಫ್ಲೈನ್ ಲಭ್ಯತೆಗೆ ಡೌನ್ಲೋಡ್ ಮಾಡಿ","learningmodule":"ಕಲಿಕಾ ಮಾಡ್ಯೂಲ್","mynotebook":"ನನ್ನ ನೋಟ್ ಪುಸ್ತಕ","noBookfoundButtonText":"ಇನ್ನೂ ಹೆಚ್ಚು ನೋಡಿ","noBookfoundSubTitle":"ನಿಮ್ಮ ಮಂಡಳಿಯು ಪಠ್ಯಾಂಶವನ್ನು ಇನ್ನೂ ಸೇರಿಸಬೇಕಿದೆ. {instance} ದಲ್ಲಿ ಹೆಚ್ಚು ಪಠ್ಯಾಂಶ ನೋಡಲು ಬಟನ್ ಒತ್ತಿ","noBookfoundTitle":"ಮಂಡಳಿಯು ಪಠ್ಯಾಂಶಗಳನ್ನು ಸೇರಿಸುತ್ತಿದೆ","noTaskfoundSubTitle":"ನಿಮ್ಮ ಮಂಡಳಿಯು ಪಠ್ಯಾಂಶವನ್ನು  ಇನ್ನೂ ಸೇರಿಸಬೇಕಿದೆ.  {instance} ದಲ್ಲಿ ಹೆಚ್ಚು ಪಠ್ಯಾಂಶ ನೋಡಲು ಬಟನ್ ಒತ್ತಿ","noTaskfoundTitle":"ಮಂಡಳಿಯು ಪುಸ್ತಕಗಳನ್ನು ಸೇರಿಸುತ್ತಿದೆ","seemore":"ಇನ್ನೂ ಹೆಚ್ಚು ನೋಡಿ","task":"ಟಾಸ್ಕ್ ಗಳು","tasks":"ಟಾಸ್ಕ್ ಗಳು","task_title":"ಟಾಸ್ಕ್ ಗಳು","textbooks":"ಟಾಸ್ಕ್ ಗಳು"}},"messages":{"stmsg":{"m0125":"ಪಠ್ಯಾಂಶ ರಚಿಸಲು ಅಥವಾ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಆರಂಭಿಸಿ. ಸದ್ಯ ನೀವು ಯಾವುದೇ ಪಠ್ಯಾಂಶವನ್ನು ಡ್ರಾಫ್ಟ್ ಎಂದು ಸೇವ್ ಮಾಡಿಲ್ಲ","ms0001":"ಪಠ್ಯಾಂಶ ರಚಿಸಲು ಅಥವಾ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಆರಂಭಿಸಿ. ಸದ್ಯ ನೀವು ಯಾವುದೇ ಪಠ್ಯಾಂಶವನ್ನು ಡ್ರಾಫ್ಟ್ ಎಂದು ಸೇವ್ ಮಾಡಿಲ್ಲ"}}},"trk":{"completed_learning":"ಕಲಿಕೆಯು ಪೂರ್ಣವಾಯಿತು","essages":{"fmsg":{"m0082":"ಈ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಇನ್ನೂ ಆರಂಭವಾಗಿಲ್ಲ. ನೀವು ಇದಕ್ಕೆ ಸೇರಲು ಆಗುವುದಿಲ್ಲ"}},"frmelmnts":{"btn":{"create":"ರಚಿಸಿ","enroll":"ಸೇರಿ","resumecourse":"ಪುನರಾರಂಭಿಸಿ","unenroll":"ಬಿಡಿ","viewcoursestats":"ಅಂಕಿಅಂಶ ವೀಕ್ಷಿಸಿ","viewCourseStatsDashboard":"ಡ್ಯಾಶ್ ಬೋರ್ಡ್  ನೋಡಿ"},"instn":{"t0062":"ನೀವು ಈ ಟಾಸ್ಕ್ ಗೆ ಇನ್ನೂ ಯಾವುದೇ ಬ್ಯಾಚ್ ರಚಿಸಿಲ್ಲ. ಒಂದು ಟಾಸ್ಕ್  ರಚಿಸಿ ಮತ್ತು ಡ್ಯಾಶ್ ಬೋರ್ಡ್ ಪರಿಶೀಲಿಸಿ","t0063":"ನೀವು ಇನ್ನೂ ಯಾವುದೇ ಟಾಸ್ಕ್  ರಚಿಸಿಲ್ಲ. ಒಂದು ಹೊಸ ಟಾಸ್ಕ್  ರಚಿಸಿ ಮತ್ತು ಡ್ಯಾಶ್ ಬೋರ್ಡ್ ಪುನಃ ಪರಿಶೀಲಿಸಿ"},"lbl":{"accessCourse":"ಕಲಿಕಾ ಸಾಮಗ್ರಿಯ ಲಭ್ಯತೆ","accessToLogin":"ಪಠ್ಯಾಂಶದ ಲಭ್ಯತೆ ಹೊಂದಲು, ನೀವು ಲಾಗ್ ಇನ್ ಆಗಿ, ಟಾಸ್ಕ್  ಸೇರಬೇಕು","ActivityCourses":"ಟಾಸ್ಕ್ ಗಳು","ACTIVITY_COURSE_TITLE":"ಟಾಸ್ಕ್ ಗಳು","addCourse":"ಸೇರಿಸಿ","completedCourse":"ಪೂರ್ಣಗೊಂಡ ಟಾಸ್ಕ್ ಗಳು","completingCourseSuccessfully":"ಯಶಸ್ವಿಯಾಗಿ ಕಲಿಕೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು,","copyAsCourse":"ಕಲಿಕಾ ಸಾಮಗ್ರಿಯಂತೆ ಕಾಪಿ ಮಾಡಿ","courseContainCertificate":"ಈ ಕಲಿಕೆಯು ನಿಮಗೆ ಪ್ರಮಾಣಪತ್ರವನ್ನು ನೀಡುತ್ತದೆ","courseDetails":"ಕಲಿಕಾ ವಿವರಗಳು","courseProgress":"ಪ್ರಗತಿ","courseRelevantFor":"ಈ ಕಲಿಕೆಯು ಇವರಿಗೆ ಪ್ರಸ್ತುತವಾಗಿದೆ:","courses":"ಟಾಸ್ಕ್ ಗಳು","coursestructure":"ಕಲಿಕಾ ಮಾಡ್ಯೂಲ್","courseSuccessMessage":"ನೀವು  ಯಶಸ್ವಿಯಾಗಿ ನಿಮ್ಮ ಕಲಿಕೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದಿರಿ","courseSuccessNotificationMessage":"ನೀವು 7 ದಿನಗಳ ಒಳಗಾಗಿ ನಿಮ್ಮ ನೋಂದಾಯಿತ ಸಂಪರ್ಕ ವಿವರಕ್ಕೆ ಪ್ರಮಾಣಪತ್ರದ ಕುರಿತು ಸೂಚನೆ ಪಡೆಯುವಿರಿ","courseWithoutCertificateNote":"ಟಿಪ್ಪಣಿ:  ಈ ಕಲಿಕೆಯು ನಿಮಗೆ ಪ್ರಮಾಣಪತ್ರ ನೀಡುವುದಿಲ್ಲ","dashboardnocourseselected":"ಏನೂ ಆಯ್ಕೆ ಮಾಡಿಲ್ಲ","dashboardnocourseselecteddesc":"ಪಟ್ಟಿಯಿಂದ ಆಯ್ಕೆ ಮಾಡಿ","downloadCourseQRCode":"QR Code ಡೌನ್ಲೋಡ್ ಮಾಡಿ","downloadQRCode":{"tooltip":"QR codes ಡೌನ್ಲೋಡ್ ಗೆ ಇಲ್ಲಿ ಒತ್ತಿ ಮತ್ತು ಅವನ್ನು ನೀವು ಪ್ರಕಟಿಸಿದ್ದಕ್ಕೆ ಲಿಂಕ್ ಮಾಡಿ"},"getUnlimitedAccess":"ನಿಮ್ಮ ಮೊಬೈಲ್ ಫೋನಿನಲ್ಲಿ ಪಠ್ಯಪುಸ್ತಕಗಳು, ಟಿವಿ ತರಗತಿಗಳು ಮತ್ತು  ಕೋರ್ಸ್ ಗೆ ​​ಆಫ್‌ಲೈನ್‌ನಲ್ಲಿ ಮಿತಿಯಿಲ್ಲದ ಲಭ್ಯತೆ  ಪಡೆಯಿರಿ","joinTrainingToAcessContent":"ಪಠ್ಯಾಂಶದ ಲಭ್ಯತೆ ಹೊಂದಲು, ನೀವು ಲಾಗ್ ಇನ್ ಆಗಿ, ಟಾಸ್ಕ್ ಸೇರಬೇಕು","moduleFinish":"ನೀವು ಈ  ಟಾಸ್ಕ್ ಮುಗಿಸಿದ್ದೀರಿ","moduleProgress":"ಟಾಸ್ಕ್ ಪ್ರಗತಿ","mytrainings":"ನನ್ನ ಟಾಸ್ಕ್ ಗಳು","nextModule":"ಮುಂದಿನ ಟಾಸ್ಕ್","oneCourse":"ಟಾಸ್ಕ್","prevModule":"ಹಿಂದಿನ ಟಾಸ್ಕ್","returnToCourses":"ಹಿಂದೆ","sectionTitle":"ಟಾಸ್ಕ್ ಗಳು","selectChapter":"ಟಾಸ್ಕ್ ಆಯ್ಕೆ ಮಾಡಿ","selectContentFromCourse":"ಪಠ್ಯಾಂಶಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಿ","trainingAttended":"ಕಲಿಕೆಗೆ ಹಾಜರಾಗಿದ್ದು","courseDontContainCertificate":"ಪ್ರಸ್ತುತ, ಈ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ.  ಟಾಸ್ಕ್ ರಚಿಸಿದವರು ನಂತರ ಇದಕ್ಕೆ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಲಗತ್ತಿಸಬಹುದು."},"tab":{"courses":"ಟಾಸ್ಕ್ ಗಳು"}},"messages":{"dashboard":{"emsg":{"m002":"ಬಳಕೆದಾರರು ಈ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗೆ ಇನ್ನೂ ಯಾವುದೇ ಬ್ಯಾಚ್ ಸೇರಿಲ್ಲ"}},"emsg":{"m0002":"ಈ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಇನ್ನು ಮುಂದೆ ಲಭ್ಯವಿಲ್ಲ","m0003":"ಈ ಕಲಿಕಾ ಟಾಸ್ಕ್ ತೆರೆದಿರುವ ಬ್ಯಾಚ್ ಹೊಂದಿಲ್ಲ"},"fmsg":{"dataSettingNotSubmitted":"ಪ್ರೊಫೈಲ್ ಹಂಚಿಕೆ ಸೆಟ್ಟಿಂಗ್ಸ್ ನವೀಕರಿಸಲಾಗಲಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.","m0001":"ಕ್ಷಮಿಸಿ! ನೀವು ನೋಂದಾಯಿಸಿದ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಕುರಿತ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲು ಆಗಲಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ","m0002":"ಕ್ಷಮಿಸಿ! ನಿಮಗಾಗಿ  ಕಲಿಕಾ ಟಾಸ್ಕ್ ಪಡೆಯಲು ಆಗಲಿಲ್ಲ, ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ","m0086":"ಈ ಪಠ್ಯಾಂಶವು ಇನ್ನು ಮುಂದೆ ಲಭ್ಯವಿಲ್ಲ"},"imsg":{"m0001":"ಈ ಪಠ್ಯಾಂಶವನ್ನು ಸೂಕ್ತವಾಗಿಲ್ಲ ಎಂದು ಫ್ಲಾಗ್ ಮಾಡಲಾಗಿದೆ. ಇದು ಸದ್ಯ ಪರಿಶೀಲನೆಯಲ್ಲಿದೆ","m0026":"ಹಲೋ, ಈ ಪಠ್ಯಾಂಶವು ಪ್ರಸ್ತುತ ಲಭ್ಯವಿಲ್ಲ. ಇದನ್ನು ಬದಲಾಯಿಸುತ್ತಿರಬಹುದು"},"stmsg":{"m0125":"ಪಠ್ಯಾಂಶ ರಚಿಸಲು ಅಥವಾ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಆರಂಭಿಸಿ. ಸದ್ಯ ನೀವು ಯಾವುದೇ ಕರಡು ಪಠ್ಯಾಂಶವನ್ನು ಸೇವ್ ಮಾಡಿಲ್ಲ"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"ಕೋರ್ಸ್ ಗಳು","ACTIVITY_TEXTBOOK_TITLE":"ಕೋರ್ಸ್ ಗಳು","chapter":"ಕೋರ್ಸ್ ಮಾಡ್ಯೂಲ್","desktop":{"downloadBook":"ಕೋರ್ಸ್ ಡೌನ್ಲೋಡ್ ಮಾಡಿ","find_more":"{instance} ದಲ್ಲಿ ಹೆಚ್ಚು ಕೋರ್ಸ್ ಗಳು ಮತ್ತು ಸಂಬಂಧಿತ ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ","updateTextbook":"ಕೋರ್ಸ್ ಅಪ್ಡೇಟ್ ಮಾಡಿ"},"downloadBooks":"ಆಫ್ಲೈನ್ ಲಭ್ಯತೆಗೆ ಕೋರ್ಸ್ ಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ","fromTheTextBook":"ಕೋರ್ಸ್ ನಿಂದ","noBookfoundTitle":"ಮಂಡಳಿಯು ಕೋರ್ಸ್ ಗಳನ್ನು ಸೇರಿಸುತ್ತಿದೆ","textbooks":"ಕೋರ್ಸ್ ಗಳು"}}},"trk":{"completedCourse":"ಕೋರ್ಸ್ ಪೂರ್ಣಗೊಂಡಿತು","frmelmnts":{"btn":{"createCourse":"ಕೋರ್ಸ್ ರಚಿಸಿ","enroll":"ಕೋರ್ಸ್ ಗೆ ಸೇರಿ","resumecourse":"ಕೋರ್ಸ್ ಪುನರಾರಂಭಿಸಿ","unenroll":"ಕೋರ್ಸ್ ಬಿಡಿ","viewcoursestats":"ಕೋರ್ಸ್ ನ ಅಂಕಿಅಂಶಗಳನ್ನು ವೀಕ್ಷಿಸಿ","viewCourseStatsDashboard":"ಕೋರ್ಸ್ ಡ್ಯಾಶ್ ಬೋರ್ಡ್ ವೀಕ್ಷಿಸಿ"},"instn":{"t0062":"ಈ ಕೋರ್ಸ್ ಗೆ ನೀವಿನ್ನೂ ಬ್ಯಾಚ್ ರಚಿಸಿಲ್ಲ. ಹೊಸ ಬ್ಯಾಚ್  ರಚಿಸಿ ಮತ್ತು ಡ್ಯಾಶ್ ಬೋರ್ಡ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ.","t0063":"ನೀವು ಇನ್ನೂ ಯಾವುದೇ ಕೋರ್ಸ್  ರಚಿಸಿಲ್ಲ. ಹೊಸ ಕೋರ್ಸ್  ರಚಿಸಿ ಮತ್ತು ಡ್ಯಾಶ್ ಬೋರ್ಡ್ ಅನ್ನು ಪುನಃ ಪರಿಶೀಲಿಸಿ."},"lbl":{"accessCourse":"ಕೋರ್ಸ್  ಪಡೆಯಿರಿ","accessToLogin":"ಕೋರ್ಸ್ ಲಭ್ಯತೆ ಹೊಂದಲು ನೀವು ಲಾಗ್ ಇನ್ ಆಗಿ, ಕೋರ್ಸ್ ಸೇರಿಕೊಳ್ಳಬೇಕು","ActivityCourses":"ಕೋರ್ಸ್ ಗಳು","ACTIVITY_COURSE_TITLE":"ಕೋರ್ಸ್ ಗಳು","addCourse":"ಕೋರ್ಸ್  ಸೇರಿಸಿ","completedCourse":"ಕೋರ್ಸ್ ಪೂರ್ಣಗೊಂಡಿತು","completingCourseSuccessfully":"ಯಶಸ್ವಿಯಾಗಿ ಕೋರ್ಸ್ ಪೂರ್ಣಗೊಳಿಸಲು,","copyAsCourse":"ಕೋರ್ಸ್ ನಂತೆ ಕಾಪಿ ಮಾಡಿ","courseContainCertificate":"ಇದೊಂದು ಪ್ರಮಾಣಪತ್ರದ  ಕೋರ್ಸ್","courseDetails":"ಕೋರ್ಸ್ ವಿವರಗಳು","courseDontContainCertificate":"ಪ್ರಸ್ತುತ, ಈ ಕೋರ್ಸ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ. ಕೋರ್ಸ್ ರಚಿಸಿದವರು ನಂತರ ಇದಕ್ಕೆ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಲಗತ್ತಿಸಬಹುದು.","courseLastUpdatedOn":"ಕೋರ್ಸ್ ಕೊನೆಯಬಾರಿ ನವೀಕರಿಸಿದ್ದು","courseProgress":"ಕೋರ್ಸ್ ಪ್ರಗತಿ","courseRelevantFor":"ಇವರಿಗೆ ಕೋರ್ಸ್ ಪ್ರಸ್ತುತವಾಗಿದೆ:","courses":"ಕೋರ್ಸ್ ಗಳು","coursestructure":"ಕೋರ್ಸ್ ಮಾಡ್ಯೂಲ್ ಗಳು","courseSuccessMessage":"ನೀವು ಈ ಕೋರ್ಸ್ ಯಶಸ್ವಿಯಾಗಿ ಪೂರ್ಣಗೊಳಿಸಿದಿರಿ","courseSuccessNotificationMessage":"ನೀವು 7 ದಿನಗಳ ಒಳಗಾಗಿ ನಿಮ್ಮ ನೋಂದಾಯಿತ ಸಂಪರ್ಕ ವಿವರಕ್ಕೆ ಕೋರ್ಸ್ ಪ್ರಮಾಣಪತ್ರದ ಕುರಿತು ಸೂಚನೆ ಪಡೆಯುವಿರಿ","courseWithoutCertificateNote":"ಟಿಪ್ಪಣಿ: ಈ ಕೋರ್ಸ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ","dashboardnocourseselected":"ಕೋರ್ಸ್ ಆಯ್ಕೆ ಮಾಡಿಲ್ಲ","dashboardnocourseselecteddesc":"ಮೇಲಿನ ಪಟ್ಟಿಯಿಂದ ಕೋರ್ಸ್ ಆಯ್ಕೆಮಾಡಿ","downloadCourseQRCode":"ಕೋರ್ಸ್ QR Code ಡೌನ್ಲೋಡ್ ಮಾಡಿ","downloadQRCode":{"tooltip":"QR code ಡೌನ್ಲೋಡ್  ಮಾಡಲು ಇಲ್ಲಿ ಒತ್ತಿ ಮತ್ತು ಅವನ್ನು ಪ್ರಕಟಿಸಿದ ಕೋರ್ಸ್ ಗಳಿಗೆ ಕೊಂಡಿಯಾಗಿಸಿ"},"enrollcourse":"ಕೋರ್ಸ್ ಗೆ ಸೇರಿ","getUnlimitedAccess":"ನಿಮ್ಮ ಮೊಬೈಲ್ ಫೋನಿನಲ್ಲಿ ಪಠ್ಯಪುಸ್ತಕಗಳು, ಪಾಠಗಳು ಮತ್ತು  ಕೋರ್ಸ್ ಗೆ ​​ಆಫ್‌ಲೈನ್‌ನಲ್ಲಿ ಮಿತಿಯಿಲ್ಲದ ಲಭ್ಯತೆ  ಪಡೆಯಿರಿ","joinTrainingToAcessContent":"ಪಠ್ಯಾಂಶದ ಪೂರ್ಣ ಲಭ್ಯತೆ ಪಡೆಯಲು ನೀವು ಕೋರ್ಸ್ ಗೆ ಸೇರಿಕೊಳ್ಳಬೇಕು","moduleFinish":"ನೀವು ಈ ಮಾಡ್ಯೂಲನ್ನು ಮುಗಿಸಿದ್ದೀರಿ","moduleProgress":"ಮಾಡ್ಯೂಲ್ ಪ್ರಗತಿ","mytrainings":"ನನ್ನ ಕೋರ್ಸ್ ಗಳು","nextModule":"ಮುಂದಿನ ಮಾಡ್ಯೂಲ್","oneCourse":"ಕೋರ್ಸ್","prevModule":"ಹಿಂದಿನ ಮಾಡ್ಯೂಲ್","returnToCourses":"ಕೋರ್ಸ್ ಗೆ  ಹಿಂತಿರುಗಿ","sectionTitle":"ಕೋರ್ಸ್ ಗಳು","selectChapter":"ಮಾಡ್ಯೂಲ್ ಆಯ್ಕೆ ಮಾಡಿ","selectContentFromCourse":"ಕೋರ್ಸ್ ಗೆ  ಪಠ್ಯಾಂಶಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಿ","signinenrollTitle":"ಈ ಕೋರ್ಸ್ ಸೇರಲು ಲಾಗ್ ಇನ್ ಆಗಿ","trainingAttended":"ಹಾಜರಾದ ಕೋರ್ಸ್ ಗಳು","userName":"ಬಳಕೆದಾರರ ಹೆಸರು"},"tab":{"courses":"ಕೋರ್ಸ್ ಗಳು"}},"messages":{"dashboard":{"emsg":{"m002":"ಬಳಕೆದಾರರು ಈ ಕೋರ್ಸ್ ನ ಯಾವುದೇ ಬ್ಯಾಚಿಗೆ ದಾಖಲಾಗಿಲ್ಲ"}},"emsg":{"m0002":"ಕೋರ್ಸ್ ಈಗ ಲಭ್ಯವಿಲ್ಲ","m0003":"ಈ ಕೋರ್ಸ್ ಯಾವುದೇ ಓಪನ್ ಬ್ಯಾಚ್ ಹೊಂದಿಲ್ಲ"},"fmsg":{"m0001":"ನೋಂದಾಯಿತ ಕೋರ್ಸ್ ಗಳನ್ನು ಪಡೆಯಲು ವಿಫಲವಾಯಿತು, ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ","m0002":"ಇತರ ಕೋರ್ಸುಗಳನ್ನು ಪಡೆಯಲು ಆಗಲಿಲ್ಲ, ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ","m0082":"ಈ ಕೋರ್ಸ್  ದಾಖಲಾತಿಗೆ ಇನ್ನೂ  ತೆರೆದಿಲ್ಲ","m0086":"ಲೇಖಕರು ಈ ಕೋರ್ಸ್ ತೆಗೆದುಹಾಕಿದ್ದಾರೆ, ಹೀಗಾಗಿ ಅದು ಇನ್ನು ಲಭ್ಯವಾಗುವುದಿಲ್ಲ"},"imsg":{"m0001":"ಈ ಕೋರ್ಸ್ ಸೂಕ್ತವಲ್ಲವೆಂದು ಫ್ಲ್ಯಾಗ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ಪ್ರಸ್ತುತ ಪರಿಶೀಲನೆಯಲ್ಲಿದೆ.","m0026":"ಹಾಯ್, ಈ ಕೋರ್ಸ್ ಈಗ ಲಭ್ಯವಿಲ್ಲ. ರಚನಾಕಾರರು ಕೋರ್ಸ್ ನಲ್ಲಿ  ಕೆಲವು ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಿರಬಹುದು."},"stmsg":{"m0125":"ಸಂಪನ್ಮೂಲ, ಪುಸ್ತಕ, ಕೋರ್ಸ್, ಸಂಗ್ರಹ ಅಥವಾ ಅಪ್ ಲೋಡ್ ಅನ್ನು ರಚಿಸಲು ಆರಂಭಿಸಿ. ಈಗ ಸಧ್ಯಕ್ಕೆ ನಿಮ್ಮ ಯಾವುದೇ ಡ್ರಾಫ್ಟ್(ಕರಡು) ಕೆಲಸದ-ಪ್ರಗತಿಯಲ್ಲಿ ಇಲ್ಲ."}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"ಪಠ್ಯಪುಸ್ತಕಗಳು","ACTIVITY_TEXTBOOK_TITLE":"ಪಠ್ಯ ಪುಸ್ತಕಗಳು","chapter":"ಅಧ್ಯಾಯ","copyAsCourse":"ಕೋರ್ಸ್ ನಂತೆ ಕಾಪಿ","desktop":{"deleteCollection":"{name} ಪಠ್ಯಪುಸ್ತಕವನ್ನು ಡಿಲೀಟ್ ಮಾಡಿದರೆ, ಅದು ಮೈ ಡೌನ್ಲೋಡ್ ನಿಂದ ತೆಗೆದುಹಾಕುತ್ತದೆ. ಮುಂದುವರೆಸಲು ಡಿಲೀಟ್ ಕ್ಲಿಕ್ ಮಾಡಿ.","downloadBook":"ಪಠ್ಯಪುಸ್ತಕ ಡೌನ್ಲೋಡ್ ಮಾಡಿ","find_more":"{instance} ದಲ್ಲಿ ಹೆಚ್ಚು ಪುಸ್ತಕಗಳು ಮತ್ತು ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ","updateTextbook":"ಪಠ್ಯಪುಸ್ತಕ ಅಪ್ ಡೇಟ್ ಮಾಡಿ"},"dialCodeDescription":"QR ಕೋಡ್ ನಿಮ್ಮ ಪಠ್ಯ ಪುಸ್ತಕದಲ್ಲಿ  QR  ಸಂಕೇತದ ಕೆಳಗೆ ಕಂಡುಬರುವ 6 ಅಂಕಿಯ ಆಲ್ಫಾನ್ಯೂಮರಿಕ್ ಸಂಕೇತವಾಗಿದೆ","dialCodeDescriptionGetPage":"QR ಸಂಕೇತವು ನಿಮ್ಮ ಪಠ್ಯ ಪುಸ್ತಕದಲ್ಲಿ  QR  ಸಂಕೇತದ ಇಮೇಜ್ ಕೆಳಗೆ ಕಂಡುಬರುವ  6 ಅಂಕಿಯ ಆಲ್ಫಾನ್ಯೂಮರಿಕ್ ಸಂಕೇತವಾಗಿದೆ.","downloadBooks":"ಆಫ್ಲೈನ್ ಇದ್ದಾಗ ನೋಡಲು ಪುಸ್ತಕಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ","fromTheTextBook":"ಪಠ್ಯಪುಸ್ತಕದಿಂದ","getUnlimitedAccess":"ನಿಮ್ಮ ಮೊಬೈಲ್ ಫೋನಿನಲ್ಲಿ ಪಠ್ಯಪುಸ್ತಕಗಳು, ಪಾಠಗಳು ಮತ್ತು  ಕೋರ್ಸ್ ಗೆ ​​ಆಫ್‌ಲೈನ್‌ನಲ್ಲಿ ಮಿತಿಯಿಲ್ಲದ ಲಭ್ಯತೆ  ಪಡೆಯಿರಿ","import":"ಆಫ್ಲೈನ್ ಇದ್ದಾಗ ನೋಡಲು ಪುಸ್ತಕಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ","installAppDesc":"ನಿಮ್ಮ ಡಿವೈಸಿನಲ್ಲಿ ಪಾಠಗಳು, ಪಠ್ಯಪುಸ್ತಕಗಳು ಮತ್ತು ಪಠ್ಯಾಂಶಗಳನ್ನು ಆಫ್ಲೈನಿನಲ್ಲಿ ಸಂಗ್ರಹಿಸಿ","mynotebook":"ನನ್ನ ನೋಟ್ ಪುಸ್ತಕ","noBookfoundButtonText":"ಹೆಚ್ಚು ಪುಸ್ತಕಗಳು ಮತ್ತು ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ.","noBookfoundSubTitle":"ನಿಮ್ಮ ಮಂಡಳಿಯು ಹೆಚ್ಚು ಪುಸ್ತಕಗಳನ್ನು ಇನ್ನೂ ಸೇರಿಸಬೇಕಿದೆ.  {instance} ದಲ್ಲಿ ಹೆಚ್ಚು ಪುಸ್ತಕಗಳು ಮತ್ತು ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಲು ಬಟನ್ ಒತ್ತಿ","noBookfoundTitle":"ಮಂಡಳಿಯು ಪುಸ್ತಕಗಳನ್ನು ಸೇರಿಸುತ್ತಿದೆ","textbooks":"ಡಿಜಿಟಲ್  ಪಠ್ಯಪುಸ್ತಕಗಳು"}},"messages":{"stmsg":{"m0125":"ಸಂಪನ್ಮೂಲ, ಪುಸ್ತಕ, ಕೋರ್ಸ್, ಸಂಗ್ರಹ ಅಥವಾ ಅಪ್ ಲೋಡ್ ಅನ್ನು ರಚಿಸಲು ಆರಂಭಿಸಿ. ಈಗ ಸಧ್ಯಕ್ಕೆ ನಿಮ್ಮ ಯಾವುದೇ ಡ್ರಾಫ್ಟ್(ಕರಡು) ಕೆಲಸದ-ಪ್ರಗತಿಯಲ್ಲಿ ಇಲ್ಲ."}}},"trk":{"frmelmnts":{"btn":{"enroll":"ಓದಿ","resumecourse":"ಓದುವುದನ್ನು ಪುನರಾರಂಭಿಸಿ","unenroll":"ಕ್ಲೋಸ್"},"instn":{"t0062":"ನೀವು ಈ ಪಠ್ಯಪುಸ್ತಕಕ್ಕೆ ಇನ್ನೂ ಯಾವುದೇ ಕಲಿಕಾ/ಓದುವ ಬ್ಯಾಚ್   ರಚಿಸಿಲ್ಲ. ಒಂದು ಬ್ಯಾಚ್ ರಚಿಸಿ ಮತ್ತು ಡ್ಯಾಶ್ ಬೋರ್ಡ್ ಪರಿಶೀಲಿಸಿ","t0063":"ನೀವು ಇನ್ನೂ ಯಾವುದೇ ಪಠ್ಯಪುಸ್ತಕ ರಚಿಸಿಲ್ಲ. ಒಂದು ಪಠ್ಯಪುಸ್ತಕ ರಚಿಸಿ ಮತ್ತು ಡ್ಯಾಶ್ ಬೋರ್ಡ್    ಪರಿಶೀಲಿಸಿ."},"lbl":{"accessCourse":"ಪಠ್ಯಪುಸ್ತಕ ಪಡೆಯಿರಿ","accessToLogin":"ಪಠ್ಯಪುಸ್ತಕದ ಲಭ್ಯತೆ ಹೊಂದಲು ನೀವು ಲಾಗ್ ಇನ್ ಆಗಿ, ಕಲಿಕಾ/ಓದುವ ಬ್ಯಾಚ್ ಸೇರಬೇಕು","ActivityCourses":"ಪಠ್ಯಪುಸ್ತಕ","ACTIVITY_COURSE_TITLE":"ಪಠ್ಯಪುಸ್ತಕ","addCourse":"ಪಠ್ಯಪುಸ್ತಕ ಸೇರಿಸಿ","completedCourse":"ಪೂರ್ಣಗೊಳಿಸಿದ ಪಠ್ಯಪುಸ್ತಕಗಳು","completingCourseSuccessfully":"ಯಶಸ್ವಿಯಾಗಿ ಕಲಿಕೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು,","copyAsCourse":"ಪಠ್ಯಪುಸ್ತಕದಂತೆ ಕಾಪಿ ಮಾಡಿ","courseDetails":"ಪಠ್ಯಪುಸ್ತಕದ ವಿವರಗಳು","courses":"ಪಠ್ಯಪುಸ್ತಕಗಳು","coursestructure":"ಅಧ್ಯಾಯ","joinTrainingToAcessContent":"ಪಠ್ಯಾಂಶವನ್ನು ಪಡೆಯಲು ನೀವು, ಲಾಗ್ ಇನ್ ಆಗಿ, ಕಲಿಕಾ ಬ್ಯಾಚ್ ಸೇರಬೇಕು","moduleFinish":"ನೀವು ಈ ಅಧ್ಯಾಯವನ್ನು ಮುಗಿಸಿದ್ದೀರಿ","moduleProgress":"ಅಧ್ಯಾಯದ ಪ್ರಗತಿ","mytrainings":"ನನ್ನ ಡಿಜಿಟಲ್ ಪಠ್ಯಪುಸ್ತಕಗಳು","nextModule":"ಮುಂದಿನ ಅಧ್ಯಾಯ","oneCourse":"ಡಿಜಿಟಲ್ ಪಠ್ಯಪುಸ್ತಕ","prevModule":"ಹಿಂದಿನ ಅಧ್ಯಾಯ","sectionTitle":"ಡಿಜಿಟಲ್ ಪಠ್ಯಪುಸ್ತಕಗಳು","selectChapter":"ಅಧ್ಯಾಯ ಆಯ್ಕೆ ಮಾಡಿ","trainingAttended":"ಪಠ್ಯಪುಸ್ತಕಗಳ ಓದು","courseContainCertificate":"ಈ ಕಲಿಕೆಯು ನಿಮಗೆ ಪ್ರಮಾಣಪತ್ರವನ್ನು ನೀಡುತ್ತದೆ","courseDontContainCertificate":"ಪ್ರಸ್ತುತ, ಈ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ.  ಟಾಸ್ಕ್ ರಚಿಸಿದವರು ನಂತರ ಇದಕ್ಕೆ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಲಗತ್ತಿಸಬಹುದು."},"tab":{"courses":"ಡಿಜಿಟಲ್ ಪಠ್ಯಪುಸ್ತಕ"}},"messages":{"emsg":{"m0002":"ಈ ಪಠ್ಯಪುಸ್ತಕವು ಇನ್ನು ಮುಂದೆ ಲಭ್ಯವಿಲ್ಲ"},"fmsg":{"dataSettingNotSubmitted":"ಪ್ರೊಫೈಲ್ ಹಂಚಿಕೆ ಸೆಟ್ಟಿಂಗ್ಸ್ ನವೀಕರಿಸಲಾಗಲಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.","m0001":"ಕ್ಷಮಿಸಿ! ನೀವು ಹುಡುಕುತ್ತಿರುವ  ಪಠ್ಯಪುಸ್ತಕವನ್ನು ಪಡೆಯಲು ಆಗಲಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ","m0002":"ಕ್ಷಮಿಸಿ! ಬೇರೆ ಪಠ್ಯಪುಸ್ತಕಗಳನ್ನು ಪಡೆಯಲು ಆಗಲಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ","m0086":"ಈ ಪಠ್ಯಪುಸ್ತಕವು ಇನ್ನು ಮುಂದೆ ಲಭ್ಯವಿಲ್ಲ"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"ಟಿವಿ ತರಗತಿಗಳು","ACTIVITY_TEXTBOOK_TITLE":"ಟಿವಿ ತರಗತಿಗಳು","ACTIVITY_TV_CLASS_TITLE":"ಟಿವಿ ತರಗತಿಗಳು","chapter":"ಟಿವಿ ಕಾರ್ಯಕ್ರಮ","collection_tv_classes":"ಟಿವಿ ತರಗತಿಗಳು","desktop":{"downloadBook":"ಟಿವಿ ತರಗತಿಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ","downloadTVclasses":"ಟಿವಿ ತರಗತಿಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ","find_more":"{instance} ದಲ್ಲಿ ಹೆಚ್ಚು ಟಿವಿ ತರಗತಿಗಳು ಮತ್ತು ಸಂಬಂಧಿತ ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ","find_more_TVclasses":"{instance} ದಲ್ಲಿ ಹೆಚ್ಚು ಟಿವಿ ತರಗತಿಗಳು ಮತ್ತು ಸಂಬಂಧಿತ ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ","updateTextbook":"ಟಿವಿ ತರಗತಿಗಳನ್ನು ನವೀಕರಿಸಿ","updateTVclasses":"ಟಿವಿ ತರಗತಿಗಳನ್ನು ನವೀಕರಿಸಿ"},"downloadBooks":"ಆಫ್ಲೈನ್ ಲಭ್ಯತೆಗೆ ಟಿವಿ ತರಗತಿಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ","downloadTVclasses":"ಆಫ್ಲೈನ್ ಲಭ್ಯತೆಗೆ  ಟಿವಿ ತರಗತಿಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ","fromTheTextBook":"ಟಿವಿ ತರಗತಿಯಿಂದ","fromTheTVclasses":"ಟಿವಿ ತರಗತಿಯಿಂದ","noBookfoundTitle":"ಮಂಡಳಿಯು ಟಿವಿ ತರಗತಿಯನ್ನು ಸೇರಿಸುತ್ತಿದೆ","textbooks":"ಟಿವಿ ತರಗತಿಗಳು","TVclassesfoundTitle":"ಮಂಡಳಿಯು ಟಿವಿ ತರಗತಿಯನ್ನು ಸೇರಿಸುತ್ತಿದೆ","tv_classes":"ಟಿವಿ ತರಗತಿಗಳು","tv_program":"ಟಿವಿ ಕಾರ್ಯಕ್ರಮ"}}},"trk":{"frmelmnts":{"btn":{"enroll":"ವೀಕ್ಷಿಸಿ","resumecourse":"ನೋಡುವುದು ಪುನರಾರಂಭಿಸಿ"},"instn":{"t0062":"ನೀವು ಈ ಟಿವಿ ತರಗತಿಗೆ  ಇನ್ನೂ ಯಾವುದೇ ಕಲಿಕಾ ಬ್ಯಾಚ್ ರಚಿಸಿಲ್ಲ. ಒಂದು ಬ್ಯಾಚ್ ರಚಿಸಿ ಮತ್ತು ಡ್ಯಾಶ್ ಬೋರ್ಡ್ ಪರಿಶೀಲಿಸಿ","t0063":"ನೀವು ಇನ್ನೂ ಯಾವುದೇ ಟಿವಿ ತರಗತಿ ರಚಿಸಿಲ್ಲ. ಒಂದು ಟಿವಿ ತರಗತಿ ರಚಿಸಿ ಮತ್ತು ಡ್ಯಾಶ್ ಬೋರ್ಡ್ ಪರಿಶೀಲಿಸಿ"},"lbl":{"accessCourse":"ಟಿವಿ ತರಗತಿಗಳನ್ನು ಪಡೆಯಿರಿ","accessToLogin":"ಟಿವಿ ತರಗತಿಯ ಲಭ್ಯತೆ ಹೊಂದಲು ನೀವು ಲಾಗ್ ಇನ್ ಆಗಿ,  ಕಲಿಕಾ ಬ್ಯಾಚ್ ಸೇರಬೇಕು","ActivityCourses":"ಟಿವಿ ತರಗತಿಗಳು","ACTIVITY_COURSE_TITLE":"ಟಿವಿ ತರಗತಿಗಳು","addCourse":"ಟಿವಿ ತರಗತಿ ಸೇರಿಸಿ","completedCourse":"ಟಿವಿ ತರಗತಿಯು ಪೂರ್ಣಗೊಂಡಿತು","copyAsCourse":"ಟಿವಿ ತರಗತಿಯಂತೆ ಕಾಪಿ ಮಾಡಿ","courseContainCertificate":"ಈ ಕಲಿಕೆಯು ನಿಮಗೆ ಪ್ರಮಾಣಪತ್ರವನ್ನು ನೀಡುತ್ತದೆ","courseDetails":"ಟಿವಿ ತರಗತಿಯ ವಿವರಗಳು","courses":"ಟಿವಿ ತರಗತಿಗಳು","coursestructure":"ಟಿವಿ ಕಾರ್ಯಕ್ರಮ","moduleFinish":"ನೀವು ಈ ಕಾರ್ಯಕ್ರಮವನ್ನು ಮುಗಿಸಿದ್ದೀರಿ","moduleProgress":"ಕಾರ್ಯಕ್ರಮದ ಪ್ರಗತಿ","mytrainings":"ನನ್ನ ಟಿವಿ ತರಗತಿಗಳು","nextModule":"ಮುಂದಿನ ಕಾರ್ಯಕ್ರಮ","oneCourse":"ಟಿವಿ ತರಗತಿ","prevModule":"ಹಿಂದಿನ ಕಾರ್ಯಕ್ರಮ","sectionTitle":"ಟಿವಿ ತರಗತಿಗಳು","selectChapter":"ಕಾರ್ಯಕ್ರಮ ಆಯ್ಕೆ ಮಾಡಿ","trainingAttended":"ವೀಕ್ಷಿಸಿದ ಟಿವಿ ತರಗತಿಗಳು","courseDontContainCertificate":"ಪ್ರಸ್ತುತ, ಈ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ.  ಟಾಸ್ಕ್ ರಚಿಸಿದವರು ನಂತರ ಇದಕ್ಕೆ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಲಗತ್ತಿಸಬಹುದು"},"tab":{"courses":"ಟಿವಿ ತರಗತಿಗಳು"}},"messages":{"emsg":{"m0002":"ಈ ಟಿವಿ ತರಗತಿ ಟಾಸ್ಕ್ ಇನ್ನು ಮುಂದೆ ಲಭ್ಯವಿಲ್ಲ"},"fmsg":{"m0001":"ಕ್ಷಮಿಸಿ! ನೀವು ಹುಡುಕುತ್ತಿರುವ  ಟಿವಿ ತರಗತಿಗಳನ್ನು ಪಡೆಯಲು ಆಗಲಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ","m0002":"ಕ್ಷಮಿಸಿ! ಬೇರೆ ಟಿವಿ ತರಗತಿಯನ್ನು ಪಡೆಯಲು ಆಗಲಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ","m0086":"ಈ ಟಿವಿ ತರಗತಿಯು ಇನ್ನು ಮುಂದೆ ಲಭ್ಯವಿಲ್ಲ"}}}}}
diff --git a/utils/portal/labels/all_labels_ml.json b/utils/portal/labels/all_labels_ml.json
new file mode 100644
index 000000000..c843c841e
--- /dev/null
+++ b/utils/portal/labels/all_labels_ml.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"സൃഷ്ടിക്കുക"},"lbl":{"ActivityTextbooks":"ടാസ്‌ക്കുകൾ","ACTIVITY_TEXTBOOK_TITLE":"ടാസ്‌ക്കുകൾ","chapter":"പഠന മൊഡ്യൂൾ","collection_task":"ടാസ്‌ക്കുകൾ","desktop":{"download":"ഡൗൺലോഡുചെയ്യുക","downloadBook":"ഡൗൺലോഡുചെയ്യുക","find_more":"കൂടുതൽ ഉള്ളടക്കം കണ്ടെത്തുക","find_more_tasks":"കൂടുതൽ ഉള്ളടക്കം കണ്ടെത്തുക","update":"അപ്‌ഡേറ്റ് ചെയ്യുക","updateTextbook":"അപ്‌ഡേറ്റ് ചെയ്യുക"},"downloadBooks":"ഓഫ്‌ലൈനിലായിരിക്കുമ്പോൾ ആക്സസ് ചെയ്യുന്നതിന്  ഡൗൺലോഡ് ചെയ്യുക","downloadoffline":"ഓഫ്‌ലൈനിലായിരിക്കുമ്പോൾ ആക്സസ് ചെയ്യുന്നതിന്  ഡൗൺലോഡ് ചെയ്യുക","download_to_access_offline":"ഓഫ്‌ലൈനിലായിരിക്കുമ്പോൾ ആക്സസ് ചെയ്യുന്നതിന്  ഡൗൺലോഡ് ചെയ്യുക","fromTheLearningTask":"പഠന പ്രവർത്തനത്തിൽ നിന്ന്","fromTheTextBook":"പഠന പ്രവർത്തനത്തിൽ നിന്ന്","import":"ഓഫ്‌ലൈനിലായിരിക്കുമ്പോൾ ആക്സസ് ചെയ്യുന്നതിന്  ഡൗൺലോഡ് ചെയ്യുക","learningmodule":"പഠന മൊഡ്യൂൾ","mynotebook":"എന്റെ നോട്ട്ബുക്ക്","noBookfoundButtonText":"കൂടുതൽ കാണുക","noBookfoundSubTitle":"നിങ്ങളുടെ ബോർഡ് ഇതുവരെ ഉള്ളടക്കം ചേർത്തിട്ടില്ല.{instance}ൽ കൂടുതൽ ഉള്ളടക്കം കാണാൻ ബട്ടൺ ടാപ്പുചെയ്യുക","noBookfoundTitle":"ബോർഡ് ഉള്ളടക്കം ചേർക്കുന്നു","noTaskfoundSubTitle":"നിങ്ങളുടെ ബോർഡ് ഇതുവരെ ഉള്ളടക്കം ചേർത്തിട്ടില്ല.{instance}ൽ കൂടുതൽ ഉള്ളടക്കം കാണാൻ ബട്ടൺ ടാപ്പുചെയ്യുക","noTaskfoundTitle":"ബോർഡ് ഉള്ളടക്കം ചേർക്കുന്നു","seemore":"കൂടുതൽ കാണുക","task":"ടാസ്കുകൾ","tasks":"ടാസ്‌ക്കുകൾ","task_title":"ടാസ്‌ക്കുകൾ","textbooks":"ടാസ്‌ക്കുകൾ"}},"messages":{"stmsg":{"m0125":"ഉള്ളടക്കം സൃഷ്ടിക്കുകയോ അപ്‌ലോഡുചെയ്യുകയോ ചെയ്യുക. നിങ്ങൾക്ക് നിലവിൽ ഡ്രാഫ്റ്റായി സംരക്ഷിച്ച ഉള്ളടക്കമൊന്നുമില്ല","ms0001":"ഉള്ളടക്കം സൃഷ്ടിക്കുകയോ അപ്‌ലോഡുചെയ്യുകയോ ചെയ്യുക. നിങ്ങൾക്ക് നിലവിൽ ഡ്രാഫ്റ്റായി സംരക്ഷിച്ച ഉള്ളടക്കമൊന്നുമില്ല"}}},"trk":{"completed_learning":"പഠനം പൂർത്തിയായിരിക്കുന്നു","essages":{"fmsg":{"m0082":"ഈ പഠന പ്രവർത്തനം  ഇതുവരെ തുറന്നിട്ടില്ല. നിങ്ങൾക്ക് അതിൽ ചേരാനാവില്ല"}},"frmelmnts":{"btn":{"create":"സൃഷ്ടിക്കുക","enroll":"ചേരുക","resumecourse":"പുനരാരംഭിക്കുക","unenroll":"ഉപേക്ഷിക്കുക","viewcoursestats":"സ്ഥിതിവിവരക്കണക്കുകൾ കാണുക","viewCourseStatsDashboard":"ഡാഷ്‌ബോർഡ് കാണുക"},"instn":{"t0062":"ഈ ടാസ്കിനായി നിങ്ങൾ ഇതുവരെ ഒരു ബാച്ചും സൃഷ്ടിച്ചിട്ടില്ല. ഒരു ടാസ്‌ക് സൃഷ്‌ടിച്ച് ഡാഷ്‌ബോർഡ് പരിശോധിക്കുക","t0063":"നിങ്ങൾ ഇതുവരെ ഒരു ജോലിയും സൃഷ്ടിച്ചിട്ടില്ല. ഒരു പുതിയ ടാസ്‌ക് സൃഷ്‌ടിച്ച് ഡാഷ്‌ബോർഡ് വീണ്ടും പരിശോധിക്കുക."},"lbl":{"accessCourse":"പഠന സാമഗ്രികൾ ആക്‌സസ്സുചെയ്യുക","accessToLogin":"ഉള്ളടക്കം ആക്സസ് ചെയ്യുന്നതിന് നിങ്ങൾ ലോഗിൻ ചെയ്ത്  ടാസ്കി ൽ ചേരണം","ActivityCourses":"ടാസ്‌ക്കുകൾ","ACTIVITY_COURSE_TITLE":"ടാസ്‌ക്കുകൾ","addCourse":"ചേർക്കുക","completedCourse":"ടാസ്‌ക്കുകൾ പൂർത്തിയായിരിക്കുന്നു","completingCourseSuccessfully":"പഠനം വിജയകരമായി പൂർത്തിയാക്കിയതിന്,","copyAsCourse":"പഠന സാമഗ്രിയായി പകർത്തുക","courseContainCertificate":"ഈ പഠനം നിങ്ങൾക്ക് ഒരു സർട്ടിഫിക്കറ്റ് വാഗ്ദാനം ചെയ്യുന്നു","courseDetails":"പഠന വിശദാംശങ്ങൾ","courseProgress":"പുരോഗതി","courseRelevantFor":"ഈ പഠനം ചുവടെ പറയുന്നവയ്ക് ഉചിതമാണ് :","courses":"ടാസ്‌ക്കുകൾ","coursestructure":"പഠന മൊഡ്യൂൾ","courseSuccessMessage":"നിങ്ങളുടെ പഠനം വിജയകരമായി പൂർത്തിയാക്കിയിരിക്കുന്നു","courseSuccessNotificationMessage":"7 ദിവസത്തിനുള്ളിൽ  സർട്ടിഫിക്കറ്റിനെക്കുറിച്ച് രജിസ്റ്റർ ചെയ്ത കോൺടാക്റ്റ് വിശദാംശങ്ങളിൽ നിങ്ങളെ അറിയിക്കും","courseWithoutCertificateNote":"കുറിപ്പ്: ഈ പഠനം നിങ്ങൾക്ക് ഒരു സർട്ടിഫിക്കറ്റ് വാഗ്ദാനം ചെയ്യുന്നില്ല","dashboardnocourseselected":"തിരഞ്ഞെടുക്കലൊന്നും നടത്തിയിട്ടില്ല","dashboardnocourseselecteddesc":"ലിസ്റ്റിൽ നിന്ന് തിരഞ്ഞെടുക്കുക","downloadCourseQRCode":"QR കോഡ് ഡൗൺലോഡുചെയ്യുക","downloadQRCode":{"tooltip":"QR കോഡുകൾ  ഡൗൺലോഡുചെയ്യാൻ  ക്ലിക്കുചെയ്ത് അവ നിങ്ങളുടെ പ്രസിദ്ധീകരണത്തിലേക്ക് ലിങ്കുചെയ്യുക"},"getUnlimitedAccess":"നിങ്ങളുടെ മൊബൈൽ‌ ഫോണിൽ‌ പാഠപുസ്തകങ്ങൾ‌, ടിവി ക്ലാസുകൾ‌, കോഴ്‌സുകൾ‌ എന്നിവ ഓഫ്‌ലൈനായി പരിധിയില്ലാതെ നേടുക.","joinTrainingToAcessContent":"ഉള്ളടക്കം ആക്സസ് ചെയ്യുന്നതിന് നിങ്ങൾ ലോഗിൻ ചെയ്ത്  ടാസ്കിൽ ചേരണം","moduleFinish":"നിങ്ങൾ ഈ ടാസ്ക്  പൂർത്തിയാക്കിയിരിക്കുന്നു","moduleProgress":"ടാസ്ക്  പുരോഗതി","mytrainings":"എന്റെ ടാസ്‌ക്കുകൾ","nextModule":"അടുത്ത ടാസ്ക്","oneCourse":"ടാസ്ക്","prevModule":"മുമ്പത്തെ ടാസ്ക്","returnToCourses":"തിരികെ","sectionTitle":"ടാസ്‌ക്കുകൾ","selectChapter":"ടാസ്‌ക് തിരഞ്ഞെടുക്കുക","selectContentFromCourse":"ഉള്ളടക്കങ്ങൾ തിരഞ്ഞെടുക്കുക","trainingAttended":"പങ്കെടുത്ത  പഠനം","courseDontContainCertificate":"നിലവിൽ, ഈ പഠന പ്രവർത്തനത്തിന്  ഒരു സർട്ടിഫിക്കറ്റ് ഇല്ല. ടാസ്‌ക് സ്രഷ്‌ടാവിന് പിന്നീട് ഒരു സർട്ടിഫിക്കറ്റ് അറ്റാച്ചുചെയ്യാം"},"tab":{"courses":"ടാസ്‌ക്കുകൾ"}},"messages":{"dashboard":{"emsg":{"m002":"ഈ പഠന പ്രവർത്തനത്തിനായി  ഉപയോക്താവ് ഒരു ബാച്ചിലും ചേർന്നിട്ടില്ല"}},"emsg":{"m0002":"ഈ പഠന  പ്രവർത്തനം  ഇനി ലഭ്യമല്ല","m0003":"ഈ പഠന  പ്രവർത്തനത്തിന്  ഒരു ഓപ്പൺ ബാച്ച് ഇല്ല"},"fmsg":{"dataSettingNotSubmitted":"പ്രൊഫൈൽ പങ്കിടൽ ക്രമീകരണങ്ങൾ അപ്‌ഡേറ്റുചെയ്യാനായില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക","m0001":"ക്ഷമിക്കണം! നിങ്ങൾ  പേര് ചേർത്ത പഠന പ്രവർത്തനത്തിനായി  ഞങ്ങൾക്ക് വിവരങ്ങൾ നേടാനായില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുകv","m0002":"ക്ഷമിക്കണം! നിങ്ങൾക്കായി മറ്റ് പഠന പ്രവർത്തനങ്ങൾ  ഞങ്ങൾക്ക് നേടാനായില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക","m0086":"ഈ ഉള്ളടക്കം  ലഭ്യമല്ല"},"imsg":{"m0001":"ഈ ഉള്ളടക്കം അനുചിതമെന്ന് ഫ്ലാഗുചെയ്‌തു. ഇത് നിലവിൽ അവലോകനത്തിലാണ്","m0026":"ഹായ്, ഈ ഉള്ളടക്കം നിലവിൽ ലഭ്യമല്ല. ഇത് മാറ്റത്തിന് വിധേയമായിരിക്കാം"},"stmsg":{"m0125":"ഉള്ളടക്കം സൃഷ്ടിക്കുകയോ അപ്‌ലോഡുചെയ്യുകയോ ചെയ്യുക. നിലവിൽ നിങ്ങൾ ഒരു ഡ്രാഫ്റ്റ് ഉള്ളടക്കവും സംരക്ഷിച്ചിട്ടില്ല"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"കോഴ്സുകൾ","ACTIVITY_TEXTBOOK_TITLE":"കോഴ്സുകൾ","chapter":"കോഴ്‌സ് മൊഡ്യൂൾ","desktop":{"downloadBook":"കോഴ്‌സ് ഡൗൺലോഡുചെയ്യുക","find_more":"{instance}ൽ കൂടുതൽ കോഴ്സുകളും അനുബന്ധ ഉള്ളടക്കവും കണ്ടെത്തുക","updateTextbook":"കോഴ്‌സ് അപ്‌ഡേറ്റുചെയ്യുക"},"downloadBooks":"ഓഫ്‌ലൈനിലായിരിക്കുമ്പോൾ ആക്സസ് ചെയ്യുന്നതിന് കോഴ്സുകൾ ഡൺലോഡ് ചെയ്യുക","fromTheTextBook":"കോഴ്‌സിൽ നിന്ന്","noBookfoundTitle":"ബോർഡ് കോഴ്‌സുകൾ ചേർക്കുന്നു","textbooks":"കോഴ്സുകൾ"}}},"trk":{"completedCourse":"കോഴ്‌സ് പൂർത്തിയായിരിക്കുന്നു","frmelmnts":{"btn":{"createCourse":"കോഴ്സ് സൃഷ്ടിക്കുക","enroll":"കോഴ്‌സിൽ ചേരുക","resumecourse":"കോഴ്‌സ് പുനരാരംഭിക്കുക","unenroll":"കോഴ്‌സ് ഉപേക്ഷിക്കുക","viewcoursestats":"കോഴ്‌സ് സ്ഥിതിവിവരക്കണക്കുകൾ കാണുക","viewCourseStatsDashboard":"കോഴ്‌സ് ഡാഷ്‌ബോർഡ് കാണുക"},"instn":{"t0062":"ഈ കോഴ്‌സിനായി നിങ്ങൾ ഇതുവരെ ഒരു ബാച്ച് സൃഷ്‌ടിച്ചിട്ടില്ല. പുതിയ ബാച്ച് സൃഷ്‌ടിച്ച് ഡാഷ്‌ബോർഡ് വീണ്ടും പരിശോധിക്കുക.","t0063":"നിങ്ങൾ ഇതുവരെ ഒരു കോഴ്സും സൃഷ്ടിച്ചിട്ടില്ല.  ഒരു പുതിയ കോഴ്‌സ് സൃഷ്‌ടിച്ച് ഡാഷ്‌ബോർഡ് വീണ്ടും പരിശോധിക്കുക."},"lbl":{"accessCourse":"കോഴ്സ് ആക്സസ് ചെയ്യുക","accessToLogin":"കോഴ്‌സ് ആക്‌സസ് ചെയ്യുന്നതിന് നിങ്ങൾ ലോഗിൻ ചെയ്‌ത് കോഴ്‌സിൽ ചേരണം","ActivityCourses":"കോഴ്സുകൾ","ACTIVITY_COURSE_TITLE":"കോഴ്സുകൾ","addCourse":"കോഴ്സ് ചേർക്കുക","completedCourse":"കോഴ്‌സ് പൂർത്തിയായിരിക്കുന്നു","completingCourseSuccessfully":"കോഴ്‌സ് വിജയകരമായി പൂർത്തിയാക്കിയതിന്,","copyAsCourse":"കോഴ്‌സായി പകർത്തുക","courseContainCertificate":"ഇതൊരു സർട്ടിഫിക്കറ്റ് കോഴ്‌സാണ്","courseDetails":"കോഴ്‌സ് വിശദാംശങ്ങൾ","courseDontContainCertificate":"നിലവിൽ, ഈ കോഴ്‌സിന് ഒരു സർട്ടിഫിക്കറ്റ് ഇല്ല.  കോഴ്‌സ് സ്രഷ്‌ടാവിന് പിന്നീട് ഒരു സർട്ടിഫിക്കറ്റ് അറ്റാച്ചുചെയ്യാം.","courseLastUpdatedOn":"കോഴ്‌സ് അവസാനം അപ്‌ഡേറ്റുചെയ്‌തത്","courseProgress":"കോഴ്‌സ് പുരോഗതി","courseRelevantFor":"കോഴ്‌സ് ചുവടെ പറയുന്നവയ്ക്ക് യോജിച്ചതാണ്:","courses":"കോഴ്സുകൾ","coursestructure":"കോഴ്‌സ് മൊഡ്യൂളുകൾ","courseSuccessMessage":"നിങ്ങൾ കോഴ്സ് വിജയകരമായി പൂർത്തിയാക്കിയിരിക്കുന്നു","courseSuccessNotificationMessage":"7 ദിവസത്തിനുള്ളിൽ കോഴ്‌സ് സർട്ടിഫിക്കറ്റിനെക്കുറിച്ച് രജിസ്റ്റർ ചെയ്ത കോൺടാക്റ്റ് വിശദാംശങ്ങളിൽ നിങ്ങളെ അറിയിക്കും","courseWithoutCertificateNote":"കുറിപ്പ്: ഈ കോഴ്സിന് സർട്ടിഫിക്കറ്റ് ഇല്ല","dashboardnocourseselected":"കോഴ്‌സുകളൊന്നും തിരഞ്ഞെടുത്തിട്ടില്ല!","dashboardnocourseselecteddesc":"മുകളിലുള്ള പട്ടികയിൽ നിന്ന് ഒരു കോഴ്സ് തിരഞ്ഞെടുക്കുക","downloadCourseQRCode":"കോഴ്‌സ് QR കോഡ് ഡൗൺലോഡുചെയ്യുക","downloadQRCode":{"tooltip":"QR കോഡുകൾ ഡൗൺലോഡുചെയ്യാൻ ക്ലിക്കുചെയ്‌ത് അവ പ്രസിദ്ധീകരിച്ച കോഴ്‌സുകളിലേക്ക്  ലിങ്കുചെയ്യുക"},"enrollcourse":"കോഴ്‌സിൽ ചേരുക","getUnlimitedAccess":"നിങ്ങളുടെ മൊബൈൽ‌ ഫോണിൽ‌ ടെസ്റ്റ്‌ബുക്കുകൾ‌, പാഠങ്ങൾ‌, കോഴ്‌സുകൾ‌ എന്നിവ ഓഫ്‌ലൈനായി പരിധിയില്ലാതെ നേടുക.","joinTrainingToAcessContent":"ഉള്ളടക്കത്തിലേക്ക് പൂർണ്ണ ആക്‌സസ് ലഭിക്കുന്നതിന് നിങ്ങൾ കോഴ്‌സിൽ ചേരണം","moduleFinish":"നിങ്ങൾ ഈ മൊഡ്യൂൾ പൂർത്തിയാക്കിയിരിക്കുന്നു","moduleProgress":"മൊഡ്യൂൾ പുരോഗതി","mytrainings":"എന്റെ കോഴ്സുകൾ","nextModule":"അടുത്ത മൊഡ്യൂൾ","oneCourse":"കോഴ്സ്","prevModule":"മുമ്പത്തെ.  മൊഡ്യൂൾ","returnToCourses":"കോഴ്‌സുകളിലേക്ക് മടങ്ങുക","sectionTitle":"കോഴ്സുകൾ","selectChapter":"മൊഡ്യൂൾ തിരഞ്ഞെടുക്കുക","selectContentFromCourse":"കോഴ്‌സിനായി ഉള്ളടക്കങ്ങൾ തിരഞ്ഞെടുക്കുക","signinenrollTitle":"ഈ കോഴ്‌സിൽ ചേരാൻ ലോഗിൻ ചെയ്യുക","trainingAttended":"പങ്കെടുത്ത കോഴ്‌സുകൾ","userName":"ഉപയോക്താവിന്റെ പേര്"},"tab":{"courses":"കോഴ്സുകൾ"}},"messages":{"dashboard":{"emsg":{"m002":"ഈ കോഴ്സിന്റെ ഒരു ബാച്ചിലും ഉപയോക്താവ് ചേർത്തിട്ടില്ല"}},"emsg":{"m0002":"കോഴ്‌സ് ഇപ്പോൾ നിലവിലില്ല","m0003":"ഈ കോഴ്‌സിന് ഓപ്പൺ ബാച്ചുകളൊന്നുമില്ല"},"fmsg":{"m0001":"പേര് ചേർക്കപ്പെട്ട  കോഴ്‌സുകൾ ലഭ്യമാക്കുന്നത് പരാജയപ്പെട്ടു, ദയവായി വീണ്ടും ശ്രമിക്കുക ...","m0002":"മറ്റ് കോഴ്സുകൾ  ലഭ്യമാക്കാനായില്ല , പിന്നീട് വീണ്ടും ശ്രമിക്കുക ...","m0082":"പേര് ചേർക്കുന്നതിനായി  ഈ കോഴ്സ് തുറന്നിട്ടില്ല","m0086":"ഈ കോഴ്‌സ് രചയിതാവ് വിരമിച്ചതിനാൽ ഇനി ലഭ്യമല്ല"},"imsg":{"m0001":"ഈ കോഴ്സ് അനുചിതമെന്ന് ഫ്ലാഗുചെയ്തു, നിലവിൽ അവലോകനത്തിലാണ്.","m0026":"ഹായ്, ഈ കോഴ്സ് ഇപ്പോൾ ലഭ്യമല്ല. സ്രഷ്ടാവ് കോഴ്‌സിൽ ചില മാറ്റങ്ങൾ വരുത്തിയിട്ടുണ്ടാകാം"},"stmsg":{"m0125":"പഠന വിഭവം,പുസ്തകം, കോഴ്‌സ്, ശേഖരം സൃഷ്ടിക്കാൻ തുടങ്ങുക അല്ലെങ്കിൽ അപ്‌ലോഡ്ചെയ്യുക .നിങ്ങൾക്ക് ഇപ്പോൾ പ്രവർത്തന പുരോഗതി ഡ്രാഫ്റ്റ് ഇല്ല"}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"പാഠപുസ്തകങ്ങൾ","ACTIVITY_TEXTBOOK_TITLE":"പാഠപുസ്തകങ്ങൾ","chapter":"അധ്യായം","copyAsCourse":"കോഴ്‌സായി പകർത്തുക","desktop":{"deleteCollection":"{Name} പാഠപുസ്തകം ഡിലീറ്റ് ചെയ്യുന്നത് എന്റെ ഡൗൺലോഡുകളിൽ നിന്ന് അതിനെ നീക്കംചെയ്യുന്നു.തുടരുന്നതിന് ഡിലീറ്റ് ചെയ്യുക ക്ലിക്കുചെയ്യുക.","downloadBook":"പാഠപുസ്തകം ഡൗൺലോഡുചെയ്യുക","find_more":"{instance}ൽ കൂടുതൽ പാഠപുസ്തകങ്ങളും ഉള്ളടക്കവും കണ്ടെത്തുക","updateTextbook":"പാഠപുസ്തകം അപ്‌ഡേറ്റുചെയ്യുക"},"dialCodeDescription":"നിങ്ങളുടെ ടെക്സ്റ്റ് ബുക്കിലെ QR കോഡ് ചിത്രത്തിന് ചുവടെ കാണുന്ന 6 അക്ക ആൽഫാന്യൂമെറിക് കോഡാണ് QR കോഡ്","dialCodeDescriptionGetPage":"നിങ്ങളുടെ പാഠ പുസ്തകത്തിലെ  QR കോഡ് ചിത്രത്തിന് ചുവടെ കാണുന്ന 6 അക്ക ആൽഫാന്യൂമെറിക് കോഡാണ് QR കോഡ്.","downloadBooks":"ഓഫ്‌ലൈനിലായിരിക്കുമ്പോൾ ആക്സസ് ചെയ്യുന്നതിന് വേണ്ടി പുസ്തകങ്ങൾ ഡൗൺലോഡ് ചെയ്യുക","fromTheTextBook":"പാഠപുസ്തകത്തിൽ നിന്ന്","getUnlimitedAccess":"നിങ്ങളുടെ മൊബൈൽ‌ ഫോണിൽ‌ ടെസ്റ്റ്‌ബുക്കുകൾ‌, പാഠങ്ങൾ‌, കോഴ്‌സുകൾ‌ എന്നിവ ഓഫ്‌ലൈനായി പരിധിയില്ലാതെ നേടുക.","import":"ഓഫ്‌ലൈനിലായിരിക്കുമ്പോൾ ആക്സസ് ചെയ്യുന്നതിന് വേണ്ടി പുസ്തകങ്ങൾ ഡൗൺലോഡ് ചെയ്യുക","installAppDesc":"പാഠങ്ങളും പാഠപുസ്തകങ്ങളും ഉള്ളടക്കവും ഓഫ്‌ലൈനിൽ നിങ്ങളുടെ ഉപകരണത്തിൽ സംഭരിക്കുക","mynotebook":"എന്റെ നോട്ട്ബുക്ക്","noBookfoundButtonText":"കൂടുതൽ പുസ്തകങ്ങളും ഉള്ളടക്കങ്ങളും കാണുക","noBookfoundSubTitle":"നിങ്ങളുടെ ബോർഡ് ഇതുവരെ കൂടുതൽ പുസ്തകങ്ങൾ ചേർത്തിട്ടില്ല.{instance}ൽ കൂടുതൽ പുസ്തകങ്ങളും ഉള്ളടക്കവും കാണാൻ ബട്ടൺ ടാപ്പുചെയ്യുക","noBookfoundTitle":"ബോർഡ് പുസ്തകങ്ങൾ ചേർക്കുന്നു","textbooks":"പാഠപുസ്തകങ്ങൾ"}},"messages":{"stmsg":{"m0125":"പഠന വിഭവം,പുസ്തകം, കോഴ്‌സ്, ശേഖരം സൃഷ്ടിക്കാൻ തുടങ്ങുക അല്ലെങ്കിൽ അപ്‌ലോഡ്ചെയ്യുക .നിങ്ങൾക്ക് ഇപ്പോൾ പ്രവർത്തന പുരോഗതി ഡ്രാഫ്റ്റ് ഇല്ല"}}},"trk":{"frmelmnts":{"btn":{"enroll":"വായിക്കുക","resumecourse":"വായന പുനരാരംഭിക്കുക","unenroll":"അടയ്‌ക്കുക"},"instn":{"t0062":"ഈ പാഠപുസ്തകത്തിനായി നിങ്ങൾ ഇതുവരെ ഒരു പഠന / വായനാ ബാച്ചും സൃഷ്ടിച്ചിട്ടില്ല. ഒരു ബാച്ച് സൃഷ്‌ടിച്ച് ഡാഷ്‌ബോർഡ് പരിശോധിക്കുക","t0063":"നിങ്ങൾ ഇതുവരെ ഒരു പാഠപുസ്തകവും സൃഷ്ടിച്ചിട്ടില്ല. ഒരു പാഠപുസ്തകം സൃഷ്ടിച്ച് ഡാഷ്‌ബോർഡ് പരിശോധിക്കുക"},"lbl":{"accessCourse":"പാഠപുസ്തകം നേടുക","accessToLogin":"പാഠപുസ്തകം ആക്സസ് ചെയ്യുന്നതിന് നിങ്ങൾ ലോഗിൻ ചെയ്ത് പഠന / വായനാ ബാച്ചിൽ ചേരണം","ActivityCourses":"പാഠപുസ്തകം","ACTIVITY_COURSE_TITLE":"പാഠപുസ്തകം","addCourse":"പാഠപുസ്തകം ചേർക്കുക","completedCourse":"പൂർത്തിയാക്കിയ പാഠപുസ്തകങ്ങൾ","completingCourseSuccessfully":"പഠനം വിജയകരമായി പൂർത്തിയാക്കിയതിന്,","copyAsCourse":"പാഠപുസ്തകമായി പകർത്തുക","courseDetails":"പാഠപുസ്തക വിശദാംശങ്ങൾ","courses":"പാഠപുസ്തകങ്ങൾ","coursestructure":"അധ്യായം","joinTrainingToAcessContent":"ഉള്ളടക്കം ആക്സസ് ചെയ്യുന്നതിന്, നിങ്ങൾ പഠന ബാച്ചിൽ ചേരണം","moduleFinish":"നിങ്ങൾ ഈ അധ്യായം പൂർത്തിയാക്കിയിരിക്കുന്നു","moduleProgress":"അധ്യായം പുരോഗതി","mytrainings":"എന്റെ ഡിജിറ്റൽ പാഠപുസ്തകങ്ങൾ","nextModule":"അടുത്ത അധ്യായം","oneCourse":"ഡിജിറ്റൽ പാഠപുസ്തകം","prevModule":"മുമ്പത്തെ അധ്യായം","sectionTitle":"ഡിജിറ്റൽ പാഠപുസ്തകങ്ങൾ","selectChapter":"അധ്യായം തിരഞ്ഞെടുക്കുക","trainingAttended":"പാഠപുസ്തകങ്ങൾ വായിച്ചു","courseContainCertificate":"ഈ പഠനം നിങ്ങൾക്ക് ഒരു സർട്ടിഫിക്കറ്റ് വാഗ്ദാനം ചെയ്യുന്നു","courseDontContainCertificate":"നിലവിൽ, ഈ പഠന പ്രവർത്തനത്തിന്  ഒരു സർട്ടിഫിക്കറ്റ് ഇല്ല. ടാസ്‌ക് സ്രഷ്‌ടാവിന് പിന്നീട് ഒരു സർട്ടിഫിക്കറ്റ് അറ്റാച്ചുചെയ്യാം"},"tab":{"courses":"ഡിജിറ്റൽ പാഠപുസ്തകം"}},"messages":{"emsg":{"m0002":"ഈ പാഠപുസ്തകം ഇനി  ലഭ്യമല്ല"},"fmsg":{"dataSettingNotSubmitted":"പ്രൊഫൈൽ പങ്കിടൽ ക്രമീകരണങ്ങൾ അപ്‌ഡേറ്റുചെയ്യാനായില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക","m0001":"ക്ഷമിക്കണം! നിങ്ങൾ തിരയുന്ന പാഠപുസ്തകം ഞങ്ങൾക്ക് നേടാനായില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക","m0002":"ക്ഷമിക്കണം! നിങ്ങൾക്ക് മറ്റ് പാഠപുസ്തകങ്ങൾ നേടാനായില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക","m0086":"ഈ പാഠപുസ്തകം ഇനി ലഭ്യമല്ല"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"ടിവി ക്ലാസുകൾ","ACTIVITY_TEXTBOOK_TITLE":"ടിവി  ക്ലാസുകൾ","ACTIVITY_TV_CLASS_TITLE":"ടിവി ക്ലാസുകൾ","chapter":"ടി വി പ്രോഗ്രാം","collection_tv_classes":"ടിവി  ക്ലാസുകൾ","desktop":{"downloadBook":"ടിവി ക്ലാസുകൾ ഡൗൺലോഡുചെയ്യുക","downloadTVclasses":"ടിവി ക്ലാസുകൾ ഡൗൺലോഡുചെയ്യുക","find_more":"{instance}ൽ  കൂടുതൽ ടിവി ക്ലാസുകളും അനുബന്ധ ഉള്ളടക്കവും കണ്ടെത്തുക","find_more_TVclasses":"{instance}ൽ  കൂടുതൽ ടിവി ക്ലാസുകളും അനുബന്ധ ഉള്ളടക്കവും കണ്ടെത്തുക","updateTextbook":"ടിവി ക്ലാസുകൾ അപ്‌ഡേറ്റുചെയ്യുക","updateTVclasses":"ടിവി ക്ലാസുകൾ അപ്‌ഡേറ്റുചെയ്യുക"},"downloadBooks":"ഓഫ്‌ലൈനിലായിരിക്കുമ്പോൾ ആക്‌സസ്സുചെയ്യുന്നതിന് ടിവി ക്ലാസുകൾ ഡൗൺലോഡുചെയ്യുക","downloadTVclasses":"ഓഫ്‌ലൈനിലായിരിക്കുമ്പോൾ ആക്‌സസ്സുചെയ്യുന്നതിന് ടിവി ക്ലാസുകൾ ഡൗൺലോഡുചെയ്യുക","fromTheTextBook":"ടിവി ക്ലാസ്സിൽ നിന്ന്","fromTheTVclasses":"ടിവി ക്ലാസ്സിൽ നിന്ന്","noBookfoundTitle":"ബോർഡ് ടിവി ക്ലാസുകൾ ചേർക്കുന്നു","textbooks":"ടിവി ക്ലാസുകൾ","TVclassesfoundTitle":"ബോർഡ് ടിവി ക്ലാസുകൾ ചേർക്കുന്നു","tv_classes":"ടിവി ക്ലാസുകൾ","tv_program":"ടി വി പ്രോഗ്രാം"}}},"trk":{"frmelmnts":{"btn":{"enroll":"കാണുക","resumecourse":"കാണുന്നത് പുനരാരംഭിക്കുക"},"instn":{"t0062":"ഈ ടിവി ക്ലാസ്സിനായി ഇതുവരെ ഒരു പഠന ബാച്ചും സൃഷ്ടിച്ചിട്ടില്ല. ഒരു ബാച്ച് സൃഷ്‌ടിച്ച് ഡാഷ്‌ബോർഡ് പരിശോധിക്കുക","t0063":"നിങ്ങൾ ഇതുവരെ ഒരു ടിവി ക്ലാസും സൃഷ്ടിച്ചിട്ടില്ല. ഒരു ടിവി ക്ലാസ് സൃഷ്‌ടിച്ച് ഡാഷ്‌ബോർഡ് പരിശോധിക്കുക"},"lbl":{"accessCourse":"ടിവി ക്ലാസുകൾ നേടുക","accessToLogin":"ടിവി ക്ലാസ് ആക്‌സസ് ചെയ്യുന്നതിന് നിങ്ങൾ ലോഗിൻ ചെയ്‌ത് പഠന ബാച്ചിൽ ചേരണം","ActivityCourses":"ടിവി ക്ലാസുകൾ","ACTIVITY_COURSE_TITLE":"ടിവി ക്ലാസുകൾ","addCourse":"ടിവി ക്ലാസ് ചേർക്കുക","completedCourse":"പൂർത്തിയാക്കിയ ടിവി ക്ലാസുകൾ","copyAsCourse":"ടിവി ക്ലാസായി പകർത്തുക","courseContainCertificate":"ഈ പഠനം നിങ്ങൾക്ക് ഒരു സർട്ടിഫിക്കറ്റ് വാഗ്ദാനം ചെയ്യുന്നു","courseDetails":"ടിവി ക്ലാസ് വിശദാംശങ്ങൾ","courses":"ടിവി ക്ലാസുകൾ","coursestructure":"ടി വി പ്രോഗ്രാം","moduleFinish":"നിങ്ങൾ ഈ പ്രോഗ്രാം പൂർത്തിയാക്കിയിരിക്കുന്നു","moduleProgress":"പ്രോഗ്രാം പുരോഗതി","mytrainings":"എന്റെ ടിവി ക്ലാസുകൾ","nextModule":"അടുത്ത പ്രോഗ്രാം","oneCourse":"ടിവി ക്ലാസ്","prevModule":"മുമ്പത്തെ. പ്രോഗ്രാം","sectionTitle":"ടിവി ക്ലാസുകൾ","selectChapter":"പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക","trainingAttended":"ടിവി ക്ലാസുകൾ കണ്ടു","courseDontContainCertificate":"നിലവിൽ, ഈ പഠന പ്രവർത്തനത്തിന്  ഒരു സർട്ടിഫിക്കറ്റ് ഇല്ല. ടാസ്‌ക് സ്രഷ്‌ടാവിന് പിന്നീട് ഒരു സർട്ടിഫിക്കറ്റ് അറ്റാച്ചുചെയ്യാം"},"tab":{"courses":"ടിവി ക്ലാസുകൾ"}},"messages":{"emsg":{"m0002":"ഈ ടിവി ക്ലാസ് ടാസ്‌ക് ഇനി ലഭ്യമല്ല"},"fmsg":{"m0001":"ക്ഷമിക്കണം! നിങ്ങൾ തിരയുന്ന ടിവി ക്ലാസുകൾ ഞങ്ങൾക്ക് നേടാനായില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക","m0002":"ക്ഷമിക്കണം! ഞങ്ങൾക്ക് നിങ്ങൾക്കായി മറ്റ് ടിവി ക്ലാസുകൾ നേടാനായില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക","m0086":"ഈ ടിവി ക്ലാസ് ഇപ്പോൾ ലഭ്യമല്ല"}}}}}
\ No newline at end of file
diff --git a/utils/portal/labels/all_labels_mr.json b/utils/portal/labels/all_labels_mr.json
new file mode 100644
index 000000000..b0ea46593
--- /dev/null
+++ b/utils/portal/labels/all_labels_mr.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"निर्माण करा"},"lbl":{"ActivityTextbooks":"कार्ये","ACTIVITY_TEXTBOOK_TITLE":"कार्ये","chapter":"अभ्यासक्रम विभाग","collection_task":"कार्ये","desktop":{"download":"डाउनलोड","downloadBook":"डाउनलोड","find_more":"अधिक सामग्री मिळवा","find_more_tasks":"अधिक सामग्री पहा","update":"अपडेट","updateTextbook":"अपडेट"},"downloadBooks":"ऑफलाइन प्रवेश  मिळवण्यासाठी डाउनलोड करा","downloadoffline":"ऑफलाइन प्रवेश मिळवण्यासाठी डाउनलोड करा","download_to_access_offline":"ऑफलाइन प्रवेश मिळवण्यासाठी डाउनलोड करा","fromTheLearningTask":"अभ्यास कार्यामधील","fromTheTextBook":"अभ्यास  कार्यामधून","import":"ऑफलाइन प्रवेश मिळवण्यासाठी डाउनलोड करा","learningmodule":"अभ्यास विभाग","mynotebook":"माझी नोटबुक","noBookfoundButtonText":"अधिक पहा","noBookfoundSubTitle":"तुमच्या बोर्डाने अजून सामग्री जोडलेली नाही. {instance}वर अधिक सामग्री पाहण्यासाठी बटण टॅप करा","noBookfoundTitle":"बोर्ड सामग्री जोडत आहे","noTaskfoundSubTitle":"तुमच्या बोर्डाने अजून सामग्री जोडलेली नाही. {instance}वर अधिक सामग्री पाहण्यासाठी बटण टॅप करा","noTaskfoundTitle":"बोर्ड सामग्री जोडत आहे","seemore":"अधिक पहा","task":"कार्ये","tasks":"कार्ये","task_title":"कार्ये","textbooks":"कार्ये"}},"messages":{"stmsg":{"m0125":"सामग्री निर्माण किंवाअपलोड करण्यास सुरू करा. तुमच्याकडे अजून कोणत्याही सामग्रीचा मसुदा सेव्ह केलेला नाही","ms0001":"सामग्री निर्माण किंवा अपलोड करण्यास सुरुवात करा. सध्या तुमच्याकडे कोणत्याही सामग्रीचा मसुदा सेव्ह केलेला नाही"}}},"trk":{"completed_learning":"अभ्यासक्रम पूर्ण झाला","essages":{"fmsg":{"m0082":"हे अभ्यास कार्य अजून सुरू झालेले नाही. तुम्ही त्यात सहभागी होऊ शकत नाही"}},"frmelmnts":{"btn":{"create":"निर्माण करा","enroll":"सहभागी व्हा","resumecourse":"पुन्हा  सुरू करा","unenroll":"सोडा","viewcoursestats":"आकडेवारी पहा","viewCourseStatsDashboard":"डॅशबोर्ड पहा"},"instn":{"t0062":"या कार्यासाठी तुम्ही अजून कोणतीही बॅच निर्माण केलेली नाही. कार्य निर्माण करा व डॅशबोर्ड तपासा","t0063":"तुम्ही अजून कोणतेही कार्य निर्माण केलेले नाही. नवीन कार्य निर्माण करा व पुन्हा डॅशबोर्ड तपासा."},"lbl":{"accessCourse":"अभ्यास सामग्रीवर प्रवेश मिळवा","accessToLogin":"सामग्रीवर प्रवेश मिळवण्यासाठी लॉगिन करून कार्यात सहभागी होणे आवश्यक आहे","ActivityCourses":"कार्ये","ACTIVITY_COURSE_TITLE":"कार्ये","addCourse":"जोडा","completedCourse":"पूर्ण झालेली कार्ये","completingCourseSuccessfully":"अभ्यासक्रम यशस्वीरीत्या पूर्ण करण्यासाठी,","copyAsCourse":"अभ्यास साहित्य म्हणून कॉपी करा","courseContainCertificate":"या अभ्यासक्रमानंतर तुम्हाला प्रमाणपत्र मिळेल","courseDetails":"अभ्यास तपशील","courseProgress":"प्रगती","courseRelevantFor":"हा अभ्यासक्रम यांना अनुरूप आहे:","courses":"कार्ये","coursestructure":"अभ्यासक्रम विभाग","courseSuccessMessage":"तुम्ही तुमचा अभ्यासक्रम यशस्वीरीत्या पूर्ण केला आहे","courseSuccessNotificationMessage":"तुम्ही नोंदवलेल्या संपर्क तपशिलांवर ७ दिवसात तुम्हाला तुमच्या प्रमाणपत्राबद्दल कळवले जाईल","courseWithoutCertificateNote":"सूचना: या अभ्यासक्रमानंतर तुम्हाला प्रमाणपत्र मिळणार नाही","dashboardnocourseselected":"निवड केलेली नाही","dashboardnocourseselecteddesc":"यादीमधून निवडा","downloadCourseQRCode":"QR कोड डाउनलोड करा","downloadQRCode":{"tooltip":"QR कोड डाउनलोड करून तुमच्या प्रकाशनासोबत जोडण्यासाठी क्लिक करा"},"getUnlimitedAccess":"तुमच्या मोबाइल फोनवर ऑफलाइन स्वरूपात पाठ्यपुस्तके, टीव्ही वर्ग व कोर्सेस यांवर अमर्यादित प्रवेश मिळवा","joinTrainingToAcessContent":"सामग्रीवर प्रवेश मिळवण्यासाठी तुम्हला लॉगिन करून कार्यात सहभागी व्हावे लागेल","moduleFinish":"तुम्ही हे कार्य पूर्ण केले आहे","moduleProgress":"कार्य प्रगती","mytrainings":"माझी कार्ये","nextModule":"पुढील कार्य","oneCourse":"कार्य","prevModule":"मागील कार्य","returnToCourses":"मागे","sectionTitle":"कार्ये","selectChapter":"कार्य निवडा","selectContentFromCourse":"सामग्री निवडा","trainingAttended":"स्वीकारलेले अभ्यासक्रम","courseDontContainCertificate":"सध्या या अभ्यास कार्याला प्रमाणपत्र नाही. कार्य निर्माता कालांतराने प्रमाणपत्र जोडण्याची शक्यता आहे."},"tab":{"courses":"कार्ये"}},"messages":{"dashboard":{"emsg":{"m002":"या अभ्यास कार्यासाठी वापरकर्ता  कोणतीही बॅचमध्ये सहभागी झालेला नाही"}},"emsg":{"m0002":"हे अभ्यास कार्य आता उपलब्ध नाही","m0003":"या अभ्यास कार्यासाठी चालू  बॅच नाही"},"fmsg":{"dataSettingNotSubmitted":"प्रोफाइल सामायिकरण सेटिंग अपडेट करू शकलो नाही. नंतर पुन्हा प्रयत्न करा","m0001":"क्षमस्व! तुम्ही ज्या अभ्यास कार्यासाठी नोंदणी केली आहे त्याबद्दल आम्हाला माहिती मिळत नाही . नंतर पुन्हा प्रयत्न करा","m0002":"क्षमस्व! आम्ही तुमच्यासाठी इतर अभ्यास कार्य आणू शकलो नाही. नंतर पुन्हा प्रयत्न करा","m0086":"ही सामग्री आता उपलब्ध नाही"},"imsg":{"m0001":"हा मजकूर अनुचित म्हणून ध्वजांकित केला गेला आहे. त्याचे पुनरावलोकन चालू आहे","m0026":"नमस्कार, ही सामग्री सध्या उपलब्ध नाही. त्यात फेरबदल होत असल्याची शक्यता आहे"},"stmsg":{"m0125":"सामग्री निर्माण किंवा अपलोड करण्यास सुरू करा. सध्या तुम्ही कोणत्याही सामग्रीचा मसुदा सेव्ह केलेला नाही"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"कोर्सेस","ACTIVITY_TEXTBOOK_TITLE":"कोर्सेस","chapter":"कोर्स विभाग","desktop":{"downloadBook":"कोर्स डाउनलोड करा","find_more":"{instance} वर अधिक कोर्सेस  व संबंधित सामग्री पहा","updateTextbook":"कोर्स अपडेट करा"},"downloadBooks":"ऑफलाइन असताना प्रवेश करण्यासाठी कोर्सेस डाउनलोड करा","fromTheTextBook":"कोर्समधील","noBookfoundTitle":"बोर्ड कोर्सेस जोडत आहे","textbooks":"कोर्सेस"}}},"trk":{"completedCourse":"अभ्यासक्रम संपला","frmelmnts":{"btn":{"createCourse":"कोर्स तयार करा","enroll":"नाव नोंदवा","resumecourse":"कोर्स पुन्हा सुरु करा","unenroll":"कोर्स सोडा","viewcoursestats":"अभ्यासक्रमाची सांख्यिकी माहिती","viewCourseStatsDashboard":"कोर्सचा फलक पहा"},"instn":{"t0062":"या  कोर्ससाठी तुम्ही अजून बॅच तयार केलेली नाही. नवीन बॅच तयार करा व पुन्हा फलक तपासा.","t0063":"तुम्ही अजून कोणताही कोर्स तयार केलेला नाही. नवीन कोर्स तयार करा व पुन्हा फलक चेक करा."},"lbl":{"accessCourse":"कोर्स प्रवेश","accessToLogin":"कोर्स प्लेयर वापरण्यासाठी तुम्हाला लॉग इन करून कोर्स मध्ये सामील व्हावे लागेल","ActivityCourses":"कोर्सेस","ACTIVITY_COURSE_TITLE":"कोर्सस","addCourse":"कोर्स जोडा","completedCourse":"पूर्ण केलेले कोर्स","completingCourseSuccessfully":"अभ्यासक्रम यशस्वीरीत्या पूर्ण करण्यासाठी","copyAsCourse":"कोर्स म्हणून कॉपी करा","courseContainCertificate":"या कोर्सला प्रमाणपत्र आहे","courseDetails":"कोर्स तपशील","courseDontContainCertificate":"सध्या या कोर्सला प्रमाणपत्र नाही. कोर्सचा निर्माता कालांतराने प्रमाणपत्र जोडू शकतो.","courseLastUpdatedOn":"कोर्स शेवटचा उपडेट केला","courseProgress":"कोर्स प्रगती","courseRelevantFor":"या कोर्स संबंधित माहिती:","courses":"कोर्सेस","coursestructure":"कौरसेचे विभाग","courseSuccessMessage":"तुम्ही कोर्स यशस्वीरीत्या पूर्ण केला आहे","courseSuccessNotificationMessage":"7 दिवसांच्या आत तुम्ही नोंदवलेल्या संपर्क तपशिलांद्वारे तुम्हाला कोर्स प्रमाणपत्राबाबत सूचित केले जाईल","courseWithoutCertificateNote":"सूचना: या कोर्सला प्रमाणपत्र नाही","dashboardnocourseselected":"कोणताही कोर्स निवडलेला नाही!","dashboardnocourseselecteddesc":"वरील यादीमधून एक कोर्स निवडा","downloadCourseQRCode":"कोर्ससाठी QR कोड डाउनलोड करा","downloadQRCode":{"tooltip":"QR कोड्स डाउनलोड करून त्यांना कोर्सशी निगडित  करायला इथे क्लिक करा"},"enrollcourse":"कोर्स साठी नोंदणी करा","getUnlimitedAccess":"तुमच्या मोबाइल फोनवरून अमर्याद ऑफलाइन पाठ्यपुस्तके, पाठ व कोर्सवर वापर-अधिकार मिळवा","joinTrainingToAcessContent":"मजकुराचा पूर्ण लाभ घेण्यासाठी कोर्समध्ये प्रवेश घेणे आवश्यक आहे","moduleFinish":"तुम्ही हा विभाग पूर्ण केला आहे","moduleProgress":"विभाग प्रगती","mytrainings":"माझे कोर्स","nextModule":"पुढील विभाग","oneCourse":"कोर्स","prevModule":"मागील विभाग","returnToCourses":"पुन्हा कोर्सकडे वळा","sectionTitle":"कोर्सेस","selectChapter":"विभाग निवडा","selectContentFromCourse":"कोर्ससाठी मजकूर निवडा","signinenrollTitle":"या कोर्ससाठी नोंदणी करण्यासाठी लॉग इन करा","trainingAttended":"घेतलेले कोर्स","userName":"वापरकर्ता नाव"},"tab":{"courses":"कोर्स"}},"messages":{"dashboard":{"emsg":{"m002":"या कोर्समधील कोणत्याही बॅचमध्ये वापरकर्त्याची नोंद नाही"}},"emsg":{"m0002":"हा कोर्स आता उपलब्ध नाही","m0003":"या कोर्समध्ये एकही चालू बॅच नाही"},"fmsg":{"m0001":"नोंदणीकृत कोर्स दाखवण्यास असमर्थ,  नंतर पुन्हा प्रयत्न करा","m0002":"इतर कोर्स दाखवण्यास असमर्थ, नंतर प्रयत्न करा","m0082":"हा कोर्स अजून नोंदणीसाठी उपलब्ध नाही","m0086":"हा कोर्स निर्मात्याने गैरलागू केला असल्याने, तो आता उपलब्ध नाही."},"imsg":{"m0001":"हा कोर्स अनुचित म्हणून ध्वजांकित केलेला असून, आम्ही या वेळी त्याचा आढावा घेत आहोत.","m0026":"नमस्कार, हा कोर्स सध्या उपलब्ध नाही. निर्मात्याने या कोर्समध्ये काही बदल केल्याची शक्यता आहे."},"stmsg":{"m0125":"संसाधन, पुस्तक, अभ्यासक्रम, संचय अथवा अपलोड निर्माण करण्यास सुरुवात करा. सध्या तुमच्याकडे कोणताही 'काम-चालू-आहे' असा मसुदा नाही."}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"पाठ्यपुस्तके","ACTIVITY_TEXTBOOK_TITLE":"पाठ्यपुस्तके (लवकरच येत आहेत)","chapter":"धडा","copyAsCourse":"कोर्स म्हणून कॉपी करा","desktop":{"deleteCollection":"{name} पाठ्यपुस्तक डिलिट केल्यास ते 'माझे डाउनलोड' वरून काढून टाकले जाईल. पुढे जाण्यास डिलिट क्लिक करा.","downloadBook":"पाठ्यपुस्तक डाउनलोड करा","find_more":"{instance}वर आणखी पाठ्यपुस्तके व मजकूर शोधा","updateTextbook":"पाठ्यपुस्तक अपडेट करा"},"dialCodeDescription":"QR कोड म्हणजे तुमच्या पाठ्यपुस्तकातील QR कोडच्या प्रतिमेखाली आढळणारा ६ आकडी वर्ण-संख्यायुक्त कोड.","dialCodeDescriptionGetPage":"QR कोड हा तुमच्या पाठ्यपुस्तकातील 'QR कोड' आकृतीच्या खाली आढळणारा ६ आकडी अल्फान्यूमेरिक कोड आहे.","downloadBooks":"ऑफलाईन वाचण्यासाठी पुस्तके डाउनलोड करा","fromTheTextBook":"पाठ्यपुस्तकातून","getUnlimitedAccess":"तुमच्या मोबाइल फोनवरून अमर्याद ऑफलाइन पाठ्यपुस्तके, पाठ व कोर्सवर वापर-अधिकार मिळवा","import":"ऑफलाईन वाचण्यासाठी पुस्तके डाउनलोड करा","installAppDesc":"पाठ, पाठ्यपुस्तके आणि मजकूर आपल्या यंत्रावर ऑफलाईन संचित करा","mynotebook":"माझी नोटबुक","noBookfoundButtonText":"अधिक पुस्तके व मजकूर पहा","noBookfoundSubTitle":"तुमचा बोर्ड अजून पुस्तके समाविष्ट  करत आहे. {instance} वर अधिक पुस्तके व मजकूर पाहण्यासाठी बटण टॅप करा","noBookfoundTitle":"बोर्ड पुस्तके समाविष्ट  करत आहे","textbooks":"पाठ्यपुस्तके"}},"messages":{"stmsg":{"m0125":"संसाधन, पुस्तक, अभ्यासक्रम, संचय अथवा अपलोड निर्माण करण्यास सुरुवात करा. सध्या तुमच्याकडे कोणताही 'काम-चालू-आहे' असा मसुदा नाही."}}},"trk":{"frmelmnts":{"btn":{"enroll":"वाचा","resumecourse":"वाचन पुन्हा सुरू करा","unenroll":"बंद करा"},"instn":{"t0062":"तुम्ही अजून या पाठ्यपुस्तकाच्या अभ्यासवर्गाची बॅच निर्माण केलेली नाही. बॅच निर्माण करा व डॅशबोर्ड तपासा","t0063":"तुम्ही अजून कोणतेही पाठ्यपुस्तक निर्माण केलेले नाही. पाठ्यपुस्तक निर्माण करा व डॅशबोर्ड तपासा"},"lbl":{"accessCourse":"पाठ्यपुस्तकावर प्रवेश करा","accessToLogin":"पाठ्यपुस्तकावर प्रवेश मिळवण्यासाठी लॉगिन करून अभ्यासवर्ग/वाचन बॅचमध्ये सहभागी होणे आवश्यक आहे","ActivityCourses":"पाठ्यपुस्तक","ACTIVITY_COURSE_TITLE":"पाठ्यपुस्तक","addCourse":"पाठ्यपुस्तक जोडा","completedCourse":"पूर्ण केलेली पाठ्यपुस्तके","completingCourseSuccessfully":"यशस्वीरीत्या अभ्यासक्रम पूर्ण करण्यासाठी,","copyAsCourse":"पाठ्यपुस्तक म्हणून कॉपी करा","courseDetails":"पाठ्यपुस्तक तपशील","courses":"पाठ्यपुस्तके","coursestructure":"पाठ","joinTrainingToAcessContent":"सामग्रीवर प्रवेश मिळवण्यासाठी अभ्यासवर्गाच्या बॅचमध्ये सहभागी होणे आवश्यक आहे","moduleFinish":"तुम्ही हा पाठ पूर्ण केला आहे","moduleProgress":"पाठ प्रगती","mytrainings":"माझी डिजिटल पाठ्यपुस्तके","nextModule":"पुढील पाठ","oneCourse":"डिजिटल पाठ्यपुस्तक","prevModule":"मागील पाठ","sectionTitle":"डिजिटल पाठ्यपुस्तके","selectChapter":"पाठ निवडा","trainingAttended":"वाचलेली पाठ्यपुस्तके","courseContainCertificate":"या अभ्यासक्रमानंतर तुम्हाला प्रमाणपत्र मिळेल","courseDontContainCertificate":"सध्या या अभ्यास कार्याला प्रमाणपत्र नाही. कार्य निर्माता कालांतराने प्रमाणपत्र जोडण्याची शक्यता आहे."},"tab":{"courses":"डिजिटल पाठ्यपुस्तक"}},"messages":{"emsg":{"m0002":"हे पाठ्यपुस्तक आता उपलब्ध नाही"},"fmsg":{"dataSettingNotSubmitted":"प्रोफाइल सामायिकरण सेटिंग अपडेट करू शकलो नाही. नंतर पुन्हा प्रयत्न करा","m0001":"क्षमस्व! तुम्ही शोधात असलेले पाठ्यपुस्तक आम्ही आणू शकलो नाही. नंतर पुन्हा प्रयत्न करा","m0002":"क्षमस्व! आम्ही तुमच्यासाठी इतर पाठ्यपुस्तके आणू शकलो नाही. नंतर पुन्हा प्रयत्न करा","m0086":"हे पाठ्यपुस्तक आता उपलब्ध नाही"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"टीव्ही वर्ग","ACTIVITY_TEXTBOOK_TITLE":"टीव्ही वर्ग","ACTIVITY_TV_CLASS_TITLE":"टीव्ही वर्ग","chapter":"टीव्ही कार्यक्रम","collection_tv_classes":"टीव्ही वर्ग","desktop":{"downloadBook":"टीव्ही वर्ग डाउनलोड करा","downloadTVclasses":"टीव्ही वर्ग डाउनलोड करा","find_more":"{instance} वर आणखी टीव्ही वर्ग व संबंधित सामग्री मिळवा","find_more_TVclasses":"{instance} वर अधिक टीव्ही वर्ग व संबंधित सामग्री पहा","updateTextbook":"टीव्ही वर्ग अपडेट करा","updateTVclasses":"टीव्ही वर्ग अपडेट करा"},"downloadBooks":"ऑफलाइन असताना प्रवेश मिळवण्यासाठी टीव्ही वर्ग डाउनलोड करा","downloadTVclasses":"ऑफलाइन प्रवेश मिळवण्यासाठी टीव्ही वर्ग डाउनलोड करा","fromTheTextBook":"टीव्ही वर्गामधील","fromTheTVclasses":"टीव्ही वर्गामधून","noBookfoundTitle":"बोर्ड टीव्ही वर्ग जोडत आहे","textbooks":"टीव्ही वर्ग","TVclassesfoundTitle":"बोर्ड टीव्ही वर्ग  जोडत आहे","tv_classes":"टीव्ही वर्ग","tv_program":"टीव्ही कार्यक्रम"}}},"trk":{"frmelmnts":{"btn":{"enroll":"पहा","resumecourse":"पाहणे पुन्हा सुरू करा"},"instn":{"t0062":"तुम्ही या टीव्ही वर्गाच्या अभ्यासासाठी अजून बॅच निर्माण केलेली नाही. बॅच निर्माण करा व डॅशबोर्ड तपासा","t0063":"तुम्ही अजून कोणताही टीव्ही वर्ग निर्माण केलेला नाही. टीव्ही वर्ग निर्माण करा व डॅशबोर्ड तपासा"},"lbl":{"accessCourse":"टीव्ही वर्गांवर प्रवेश मिळवा","accessToLogin":"टीव्ही वर्गात प्रवेश करण्यासाठी लॉगिन करून अभ्यासवर्गाच्या बॅचमध्ये सहभागी व्हा","ActivityCourses":"टीव्ही वर्ग","ACTIVITY_COURSE_TITLE":"टीव्ही वर्ग","addCourse":"टीव्ही वर्ग जोडा","completedCourse":"टीव्ही वर्ग पूर्ण","copyAsCourse":"टीव्ही वर्ग म्हणून कॉपी करा","courseContainCertificate":"या अभ्यासक्रमानंतर तुम्हाला प्रमाणपत्र मिळेल","courseDetails":"टीव्ही वर्ग तपशील","courses":"टीव्ही वर्ग","coursestructure":"टीव्ही कार्यक्रम","moduleFinish":"तुम्ही हा कार्यक्रम पूर्ण केला आहे","moduleProgress":"कार्यक्रम प्रगती","mytrainings":"माझे टीव्ही वर्ग","nextModule":"पुढील कार्यक्रम","oneCourse":"टीव्ही वर्ग","prevModule":"मागील कार्यक्रम","sectionTitle":"टीव्ही वर्ग","selectChapter":"कार्यक्रम निवडा","trainingAttended":"पाहिलेले टीव्ही वर्ग","courseDontContainCertificate":"सध्या या अभ्यास कार्याला प्रमाणपत्र नाही. कार्य निर्माता कालांतराने प्रमाणपत्र जोडण्याची शक्यता आहे."},"tab":{"courses":"टीव्ही वर्ग"}},"messages":{"emsg":{"m0002":"हे टीव्ही वर्ग कार्य आता उपलब्ध नाही"},"fmsg":{"m0001":"क्षमस्व! तुम्ही शोधत असलेले टीव्ही वर्ग आम्ही आणू शकलो नाही. नंतर पुन्हा प्रयत्न करा","m0002":"क्षमस्व! आम्ही तुमच्यासाठी इतर टीव्ही वर्ग आणू शकलो नाही. नंतर पुन्हा प्रयत्न करा","m0086":"हा टीव्ही वर्ग आता उपलब्ध नाही"}}}}}
\ No newline at end of file
diff --git a/utils/portal/labels/all_labels_or.json b/utils/portal/labels/all_labels_or.json
new file mode 100644
index 000000000..ef1f70465
--- /dev/null
+++ b/utils/portal/labels/all_labels_or.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"ସୃଷ୍ଟି କରନ୍ତୁ"},"lbl":{"ActivityTextbooks":"ଟାସ୍କଗୁଡ଼ିକ","ACTIVITY_TEXTBOOK_TITLE":"ଟାସ୍କଗୁଡ଼ିକ","chapter":"ଶିକ୍ଷଣ ମଡ୍ୟୁଲ","collection_task":"ଟାସ୍କଗୁଡ଼ିକ","desktop":{"download":"ଡାଉନଲୋଡ଼ କରନ୍ତୁ","downloadBook":"ଡାଉନଲୋଡ଼ କରନ୍ତୁ","find_more":"ଅଧିକ କଣ୍ଟେଣ୍ଟ୍ ଦେଖନ୍ତୁ","find_more_tasks":"ଅଧିକ କଣ୍ଟେଣ୍ଟ୍ ଦେଖନ୍ତୁ","update":"ଅପଡେଟ କରନ୍ତୁ","updateTextbook":"ଅପଡେଟ କରନ୍ତୁ"},"downloadBooks":"ଅଫଲାଇନ୍ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଡାଉନଲୋଡ୍ କରନ୍ତୁ","downloadoffline":"ଅଫଲାଇନ୍ ଥିବା ସମୟରେ ଆକ୍ସେସ୍ କରିବା ପାଇଁ  ଡାଉନଲୋଡ୍ କରନ୍ତୁ","download_to_access_offline":"ଅଫଲାଇନ୍ ଥିବା ସମୟରେ ଆକ୍ସେସ୍ କରିବା ପାଇଁ  ଡାଉନଲୋଡ୍ କରନ୍ତୁ","fromTheLearningTask":"ଶିଖୁଥିବା ଟାସ୍କରୁ","fromTheTextBook":"ଶିଖୁଥିବା ଟାସ୍କରୁ","import":"ଅଫଲାଇନ୍ ଥିବା ସମୟରେ ଆକ୍ସେସ୍ କରିବା ପାଇଁ  ଡାଉନଲୋଡ୍ କରନ୍ତୁ","learningmodule":"ଶିକ୍ଷଣ ମଡ୍ୟୁଲ","mynotebook":"ମୋ ନୋଟବୁକ୍","noBookfoundButtonText":"ଅଧିକ ଦେଖନ୍ତୁ","noBookfoundSubTitle":"ଆପଣଙ୍କ ବୋର୍ଡ କଣ୍ଟେଣ୍ଟ୍ ସାମିଲ କରିବାର ଅଛି । {instance} ରେ ଅଧିକ କଣ୍ଟେଣ୍ଟ ଦେଖିବା ପାଇଁ ଏହି ବଟନ୍ ଟ୍ୟାପ୍ କରନ୍ତୁ","noBookfoundTitle":"ବୋର୍ଡ କଣ୍ଟେଣ୍ଟ୍ ସାମିଲ କରୁଛି","noTaskfoundSubTitle":"ଆପଣଙ୍କ ବୋର୍ଡ କଣ୍ଟେଣ୍ଟ୍ ସାମିଲ କରିବାର ଅଛି । {instance} ରେ ଅଧିକ କଣ୍ଟେଣ୍ଟ ଦେଖିବା ପାଇଁ ଏହି ବଟନ୍ ଟ୍ୟାପ୍ କରନ୍ତୁ","noTaskfoundTitle":"ବୋର୍ଡ କଣ୍ଟେଣ୍ଟ୍ ସାମିଲ କରୁଛି","seemore":"ଅଧିକ ଦେଖନ୍ତୁ","task":"ଟାସ୍କଗୁଡ଼ିକ","tasks":"ଟାସ୍କଗୁଡ଼ିକ","task_title":"ଟାସ୍କଗୁଡ଼ିକ","textbooks":"ଟାସ୍କଗୁଡ଼ିକ"}},"messages":{"stmsg":{"m0125":"କଣ୍ଟେଣ୍ଟ୍ ସୃଷ୍ଟି କରିବା କିମ୍ବା ଅପଲୋଡ୍ କରିବା ଆରମ୍ଭ କରନ୍ତୁ । ଏବେ ଆପଣ କୌଣସି କଣ୍ଟେଣ୍ଟ୍ ଡ୍ରାଫ୍ଟ ଭାବରେ ସେଭ୍ କରିନାହାନ୍ତି","ms0001":"କଣ୍ଟେଣ୍ଟ୍ ସୃଷ୍ଟି କରିବା କିମ୍ବା ଅପଲୋଡ୍ କରିବା ଆରମ୍ଭ କରନ୍ତୁ । ଏବେ ଆପଣ କୌଣସି କଣ୍ଟେଣ୍ଟ୍ କୁ ଡ୍ରାଫ୍ଟ ଭାବରେ ସେଭ୍ କରିନାହାନ୍ତି"}}},"trk":{"completed_learning":"ଶିକ୍ଷା ସମାପ୍ତ ହେଲା","essages":{"fmsg":{"m0082":"ଏବେ ଏହି ଶିକ୍ଷଣ ଟାସ୍କ ସକ୍ରିୟ ନାହିଁ । ଆପଣ ଏଥିରେ ଯୋଗ ଦେଇପାରିବେ ନାହିଁ"}},"frmelmnts":{"btn":{"create":"ସୃଷ୍ଟି କରନ୍ତୁ","enroll":"ଯୋଗ ଦିଅନ୍ତୁ","resumecourse":"ପୁନଃ ଆରମ୍ଭ କରନ୍ତୁ","unenroll":"ଛାଡ଼ନ୍ତୁ","viewcoursestats":"ପରିସଂଖ୍ୟାନ ଦେଖନ୍ତୁ","viewCourseStatsDashboard":"ଡ୍ୟାସବୋର୍ଡ ଦେଖନ୍ତୁ"},"instn":{"t0062":"ଏହି ଟାସ୍କ ପାଇଁ ଆପଣ ଏପର୍ଯ୍ୟନ୍ତ କୌଣସି ବ୍ୟାଚ୍ ସୃଷ୍ଟି କରିନାହାଁନ୍ତି । ଟାସ୍କ ସୃଷ୍ଟି କରନ୍ତୁ ଏବଂ ଡାସବୋର୍ଡ ଯାଞ୍ଚ କରନ୍ତୁ","t0063":"ଆପଣ ଏପର୍ଯ୍ୟନ୍ତ କୌଣସି ଟାସ୍କ ସୃଷ୍ଟି କରିନାହାଁନ୍ତି । ନୂଆ ଟାସ୍କ ସୃଷ୍ଟି କରନ୍ତୁ ଏବଂ ଡାସବୋର୍ଡ ଯାଞ୍ଚ କରନ୍ତୁ ।"},"lbl":{"accessCourse":"ଶିକ୍ଷଣ ସାମଗ୍ରୀ ଆକ୍ସେସ୍ କରନ୍ତୁ","accessToLogin":"କଣ୍ଟେଣ୍ଟ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରି ଟାସ୍କରେ ଯୋଗ ଦେବାକୁ ପଡ଼ିବ","ActivityCourses":"ଟାସ୍କଗୁଡ଼ିକ","ACTIVITY_COURSE_TITLE":"ଟାସ୍କଗୁଡ଼ିକ","addCourse":"ଯୋଡନ୍ତୁ","completedCourse":"ଶେଷ ହୋଇଥିବା ଟାସ୍କଗୁଡ଼ିକ","completingCourseSuccessfully":"ସଫଳତାର ସହିତ ଶିକ୍ଷା ଶେଷ କରିବା ପାଇଁ","copyAsCourse":"ଶିକ୍ଷଣ ସାମଗ୍ରୀ ଭାବରେ କପି କରନ୍ତୁ","courseContainCertificate":"ଏହି ଶିକ୍ଷା ଆପଣଙ୍କୁ ସାର୍ଟିଫିକେଟ୍ ଦେଇଥାଏ","courseDetails":"ଶିକ୍ଷଣ ବିବରଣୀ","courseProgress":"ପ୍ରଗତି","courseRelevantFor":"ଏହି ଶିକ୍ଷା ଏହିମାନଙ୍କ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ:","courses":"ଟାସ୍କଗୁଡ଼ିକ","coursestructure":"ଶିକ୍ଷଣ ମଡ୍ୟୁଲ","courseSuccessMessage":"ଆପଣ ସଫଳତାର ସହ ନିଜର ଶିକ୍ଷା ଶେଷ କରିଛନ୍ତି","courseSuccessNotificationMessage":"7 ଦିନ ମଧ୍ୟରେ ଆପଣଙ୍କର ପଞ୍ଜୀକୃତ ଯୋଗାଯୋଗ ବିବରଣୀ ମାଧ୍ୟମରେ ସାର୍ଟିଫିକେଟ୍ ସମ୍ପର୍କିତ ସୂଚନା ଆପଣଙ୍କୁ ଦିଆଯିବ","courseWithoutCertificateNote":"ନୋଟ୍ : ଏହି ପାଠ୍ୟକ୍ରମରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ","dashboardnocourseselected":"କୌଣସି ଚୟନ ହୋଇନାହିଁ","dashboardnocourseselecteddesc":"ସୂଚୀରୁ ଚୟନ କରନ୍ତୁ","downloadCourseQRCode":"QR କୋଡ଼୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ","downloadQRCode":{"tooltip":"QR କୋଡ୍ ଡାଉନଲୋଡ୍ କରି ଆପଣଙ୍କ ପ୍ରକାଶନ ସହିତ ଲିଙ୍କ କରିବା ପାଇଁ କ୍ଲିକ୍ କରନ୍ତୁ"},"getUnlimitedAccess":"ଆପଣଙ୍କ ମୋବାଇଲ ଫୋନରେ ପାଠ୍ୟପୁସ୍ତକ, TV କ୍ଲାସ୍ ଓ କୋର୍ସ ଅଫଲାଇନ୍ ପାଆନ୍ତୁ","joinTrainingToAcessContent":"କଣ୍ଟେଣ୍ଟ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରି ଟାସ୍କରେ ଯୋଗ ଦେବାକୁ ପଡ଼ିବ","moduleFinish":"ଆପଣ ଏହି ଟାସ୍କ ଶେଷ କରିଛନ୍ତି","moduleProgress":"ଟାସ୍କ ପ୍ରଗତି","mytrainings":"ମୋ ଟାସ୍କଗୁଡ଼ିକ","nextModule":"ପରବର୍ତ୍ତୀ ଟାସ୍କ","oneCourse":"ଟାସ୍କ","prevModule":"ପୂର୍ବ ଟାସ୍କ","returnToCourses":"ପଛକୁ ଯାଆନ୍ତୁ","sectionTitle":"ଟାସ୍କଗୁଡ଼ିକ","selectChapter":"ଟାସ୍କ ଚୟନ କରନ୍ତୁ","selectContentFromCourse":"କଣ୍ଟେଣ୍ଟ୍ ଚୟନ କରନ୍ତୁ","trainingAttended":"ଭାଗ ନେଇଥିବା ଶିକ୍ଷା","courseDontContainCertificate":"ଏବେ ଏହି ଶିକ୍ଷା ଟାସ୍କରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ । ଟାସ୍କ ସୃଷ୍ଟିକର୍ତ୍ତା ପରେ ଏଥିରେ ସାର୍ଟିଫିକେଟ୍ ସାମିଲ କରିପାରନ୍ତି"},"tab":{"courses":"ଟାସ୍କଗୁଡ଼ିକ"}},"messages":{"dashboard":{"emsg":{"m002":"ଏହି ଶିକ୍ଷା ଟାସ୍କ ପାଇଁ ବ୍ୟବହାରକାରୀ କୌଣସି ବ୍ୟାଚରେ ଯୋଗ ଦେଇନାହାନ୍ତି"}},"emsg":{"m0002":"ଏହି ଶିକ୍ଷା ଟାସ୍କ ଆଉ ଉପଲବ୍ଧ ନାହିଁ","m0003":"ଏହି ଶିକ୍ଷା ଟାସ୍କରେ କୌଣସି ବ୍ୟାଚ୍ ଖାଲି ନାହିଁ"},"fmsg":{"dataSettingNotSubmitted":"ପ୍ରୋଫାଇଲ୍ ସେୟାର୍ ସେଟିଂସ୍ ଅପଡେଟ୍ ହୋଇ ପାରୁନାହିଁ । କିଛି ସମୟ ପରେ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ","m0001":"ଆମେ ଦୁଃଖିତ ! ଆପଣ ନାମାଙ୍କନ କରିଥିବା ଶିକ୍ଷଣ ଟାସ୍କ ସମ୍ବନ୍ଧରେ ଆମେ କୌଣସି ସୂଚନା ପାଇଲୁ ନାହିଁ । କିଛି ସମୟ ପରେ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ","m0002":"ଆମେ ଦୁଃଖିତ ! ଆପଣଙ୍କ ପାଇଁ ଅନ୍ୟ ଶିକ୍ଷା ଟାସ୍କ ମିଳିଲା ନାହିଁ । ପରେ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ","m0086":"ଏହି କଣ୍ଟେଣ୍ଟ ଆଉ ଉପଲବ୍ଧ ନାହିଁ"},"imsg":{"m0001":"ଏହି କଣ୍ଟେଣ୍ଟକୁ ଅସଙ୍ଗତ ଭାବରେ ଫ୍ଲାଗ୍ କରାଯାଇଛି । ଏବେ ଏହାକୁ ରିଭିଉ କରାଯାଉଛି","m0026":"ଏହି କଣ୍ଟେଣ୍ଟ୍ ଏବେ ଉପଲବ୍ଧ ନାହିଁ । ଏଥିରେ କିଛି ପରିବର୍ତ୍ତନ ହେଉଥାଇପାରେ ।"},"stmsg":{"m0125":"କଣ୍ଟେଣ୍ଟ୍ ସୃଷ୍ଟି କରିବା କିମ୍ବା ଅପଲୋଡ୍ କରିବା ଆରମ୍ଭ କରନ୍ତୁ । ଏବେ ଆପଣ କୌଣସି ଡ୍ରାଫ୍ଟ କଣ୍ଟେଣ୍ଟ୍ ସେଭ୍ କରିନାହାନ୍ତି"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"କୋର୍ସଗୁଡ଼ିକ","ACTIVITY_TEXTBOOK_TITLE":"କୋର୍ସଗୁଡ଼ିକ","chapter":"କୋର୍ସ ମଡ୍ୟୁଲ","desktop":{"downloadBook":"କୋର୍ସ ଡାଉନଲୋଡ୍ କରନ୍ତୁ","find_more":"{instance} ରେ ଅଧିକ କୋର୍ସ ଓ କଣ୍ଟେଣ୍ଟ୍ ଦେଖନ୍ତୁ","updateTextbook":"କୋର୍ସ ଅପଡେଟ୍ କରନ୍ତୁ"},"downloadBooks":"ଅଫଲାଇନ୍ ଥିବା ସମୟରେ ଆକ୍ସେସ୍ କରିବା ପାଇଁ କୋର୍ସ ଡାଉନଲୋଡ୍ କରନ୍ତୁ","fromTheTextBook":"କୋର୍ସରୁ","noBookfoundTitle":"ବୋର୍ଡ କୋର୍ସ ଯୋଗ କରୁଛି","textbooks":"କୋର୍ସଗୁଡ଼ିକ"}}},"trk":{"completedCourse":"କୋର୍ସ ଶେଷହେଲା","frmelmnts":{"btn":{"createCourse":"କୋର୍ସ ସୃଷ୍ଟି କରନ୍ତୁ","enroll":"କୋର୍ସରେ ନାମାଙ୍କନ କରନ୍ତୁ","resumecourse":"କୋର୍ସ ପୁନଃ ଆରମ୍ଭ  କରନ୍ତୁ","unenroll":"କୋର୍ସରୁ ବାହାରିଯାଆନ୍ତୁ","viewcoursestats":"କୋର୍ସ ପରିସଂଖ୍ୟାନ ଦେଖନ୍ତୁ","viewCourseStatsDashboard":"କୋର୍ସ ଡ୍ୟାସବୋର୍ଡ ଦେଖନ୍ତୁ"},"instn":{"t0062":"ଆପଣଏବେ ପର୍ଯ୍ୟନ୍ତ ଏହି କୋର୍ସ ନିମନ୍ତେ କୌଣସି ବ୍ୟାଚ୍ ତିଆରି କରିନାହାନ୍ତି | ନୂଆ ବ୍ୟାଚ୍ ତିଆରି କରନ୍ତୁ ଏବଂ ଡ୍ୟାସବୋର୍ଡକୁ ପୁଣିଥରେ ଯାଞ୍ଚ କରନ୍ତୁ ।","t0063":"ଆପଣ ଏବେ ପର୍ଯ୍ୟନ୍ତ କୌଣସି କୋର୍ସ ତିଆରି କରିନାହାନ୍ତି । ନୂଆ କୋର୍ସ ତିଆରି କରନ୍ତୁ ଏବଂ ଡ୍ୟାସବୋର୍ଡକୁ ପୁଣିଥରେ ଯାଞ୍ଚ କରନ୍ତୁ ।"},"lbl":{"accessCourse":"କୋର୍ସକୁ ଆକ୍ସେସ୍ କରନ୍ତୁ","accessToLogin":"କୋର୍ସ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରି କୋର୍ସରେ ଯୋଗଦାନ କରିବାକୁ ପଡିବ","ActivityCourses":"କୋର୍ସଗୁଡ଼ିକ","ACTIVITY_COURSE_TITLE":"କୋର୍ସଗୁଡ଼ିକ","addCourse":"କୋର୍ସ ଯୋଗ କରନ୍ତୁ","completedCourse":"ଶେଷ ହୋଇଥିବା କୋର୍ସଗୁଡ଼ିକ","completingCourseSuccessfully":"ଏହି କୋର୍ସକୁ ସଫଳତାର ସହିତ ଶେଷ କରିବା ପାଇଁ,","copyAsCourse":"କୋର୍ସ ଭାବରେ କପି କରନ୍ତୁ","courseContainCertificate":"ଏହା ଏକ ସାର୍ଟିଫିକେଟ୍ କୋର୍ସ ଅଟେ","courseDetails":"କୋର୍ସ ବିବରଣୀ","courseDontContainCertificate":"ଏହି କୋର୍ସରେ ସାର୍ଟିଫିକେଟ୍ ମିଳେ ନାହିଁ | କୋର୍ସ ପ୍ରସ୍ତୁତକର୍ତ୍ତା ପରେ ସାର୍ଟିଫିକେଟ୍ ବ୍ୟବସ୍ଥା କରିପାରନ୍ତି |","courseLastUpdatedOn":"ଶେଷଥର ପାଇଁ କୋର୍ସ ଅପଡ଼େଟ୍ ହୋଇଥିବା ତାରିଖ","courseProgress":"କୋର୍ସ ପ୍ରଗତି","courseRelevantFor":"ଏହି କୋର୍ସ ଏହିମାନଙ୍କ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ:","courses":"କୋର୍ସଗୁଡ଼ିକ","coursestructure":"କୋର୍ସ ମଡ୍ୟୁଲଗୁଡ଼ିକ","courseSuccessMessage":"ଆପଣ ଏହି କୋର୍ସ ସଫଳତାର ସହିତ ଶେଷ କରିଛନ୍ତି","courseSuccessNotificationMessage":"7 ଦିନ ମଧ୍ୟରେ ଆପଣଙ୍କର ପଞ୍ଜୀକୃତ ଯୋଗାଯୋଗ ବିବରଣୀ ମାଧ୍ୟମରେ କୋର୍ସ ସାର୍ଟିଫିକେଟ୍ ସମ୍ପର୍କିତ ସୂଚନା ଆପଣଙ୍କୁ ଦିଆଯିବ","courseWithoutCertificateNote":"ନୋଟ୍ : ଏହି କୋର୍ସରେ ସାର୍ଟିଫିକେଟ୍ ମିଳେ ନାହିଁ","dashboardnocourseselected":"କୌଣସି କୋର୍ସ ଚୟନ କରାଯାଇନାହିଁ","dashboardnocourseselecteddesc":"ସୂଚୀ ମଧ୍ୟରୁ ଏକ କୋର୍ସ ଚୟନ କରନ୍ତୁ","downloadCourseQRCode":"କୋର୍ସ QR କୋଡ଼୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ","downloadQRCode":{"tooltip":"QR କୋଡ୍ ଡାଉନଲୋଡ୍ କରି ତାହାକୁ ପ୍ରକାଶିତ କୋର୍ସ ସହିତ ଲିଙ୍କ କରିବା ପାଇଁ କ୍ଲିକ୍ କରନ୍ତୁ"},"enrollcourse":"କୋର୍ସରେ ଯୋଗ ଦିଅନ୍ତୁ","getUnlimitedAccess":"ଆପଣଙ୍କ ମୋବାଇଲ ଫୋନରେ ଅସୀମିତ ଅଫଲାଇନ ପାଠ୍ୟପୁସ୍ତକ, ଲେସନ୍ ଏବଂ କୋର୍ସ ପାଆନ୍ତୁ","joinTrainingToAcessContent":"କଣ୍ଟେଣ୍ଟକୁ ସମ୍ପୂର୍ଣ୍ଣ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ କୋର୍ସରେ ଯୋଗଦେବାକୁ ପଡ଼ିବ","moduleFinish":"ଆପଣ ଏହି ମଡ୍ୟୁଲ ଶେଷ କରିଛନ୍ତି","moduleProgress":"ମଡ୍ୟୁଲ୍ ପ୍ରଗତି","mytrainings":"ମୋ କୋର୍ସଗୁଡ଼ିକ","nextModule":"ପରବର୍ତ୍ତୀ ମଡ୍ୟୁଲ୍","oneCourse":"କୋର୍ସ","prevModule":"ପୂର୍ବ ମଡ୍ୟୁଲ୍","returnToCourses":"କୋର୍ସକୁ ଫେରନ୍ତୁ","sectionTitle":"କୋର୍ସଗୁଡ଼ିକ","selectChapter":"ମଡ୍ୟୁଲ୍ ଚୟନ କରନ୍ତୁ","selectContentFromCourse":"କୋର୍ସ ପାଇଁ କଣ୍ଟେଣ୍ଟ୍ ଚୟନ କରନ୍ତୁ","signinenrollTitle":"ଏହି କୋର୍ସରେ ନାମାଙ୍କନ କରିବା ନିମନ୍ତେ ଲଗ୍ ଇନ୍ କରନ୍ତୁ","trainingAttended":"ଭାଗନେଇଥିବା କୋର୍ସଗୁଡ଼ିକ","userName":"ବ୍ୟବହାରକାରୀଙ୍କ ନାମ"},"tab":{"courses":"କୋର୍ସଗୁଡ଼ିକ"}},"messages":{"dashboard":{"emsg":{"m002":"ଏହି କୋର୍ସର କୌଣସି ବ୍ୟାଚରେ ୟୁଜର ପଂଜିକୃତ ହୋଇନାହାନ୍ତି"}},"emsg":{"m0002":"ଏହି କୋର୍ସ ଆଉ ନାହିଁ","m0003":"ଏହି କୋର୍ସରେ କୌଣସି ଓପନ୍ ବ୍ୟାଚ୍ ନାହିଁ"},"fmsg":{"m0001":"ନାମାଙ୍କିତ କୋର୍ସଗୁଡ଼ିକୁ ଆଣିପାରୁନାହିଁ, କିଛି ସମୟ ପରେ ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ","m0002":"ଅନ୍ୟ ପାଠ୍ୟକ୍ରମଗୁଡ଼ିକୁ ଆଣିପାରୁନାହିଁ, କିଛି ସମୟ ପରେ ପ୍ରୟାସ କରନ୍ତୁ...","m0082":"ଏହି କୋର୍ସ ନାମାଙ୍କନ ନିମନ୍ତେ ଉପଲବ୍ଧ ନାହିଁ","m0086":"ଏହି କୋର୍ସଟି ଗଠନକାରୀଙ୍କ ଦ୍ୱାରା ବାହାର କରାଯାଇଛି ଏବଂ ସେଥିପାଇଁ ଏହା ଆଉ ଉପଲବ୍ଧ ନାହିଁ"},"imsg":{"m0001":"ଏହି କୋର୍ସକୁ ଅନୁପଯୁକ୍ତ ବୋଲି ଚିହ୍ନଟ କରାଯାଇଛି ଏବଂ ବର୍ତ୍ତମାନ ସମୀକ୍ଷା କରାଯାଉଅଛି  ।","m0026":"ଏହି କୋର୍ସ ଏବେ ଉପଲବ୍ଧ ନାହିଁ | ଏହି କୋର୍ସରେ ନିର୍ମାତା କିଛି ପରିବର୍ତ୍ତନ କରିଥିବାର ସମ୍ଭାବନା ଅଛି ।"},"stmsg":{"m0125":"ସଂସାଧନ, ପୁସ୍ତକ, କୋର୍ସ, ସଂଗ୍ରହ ସୃଷ୍ଟି କିମ୍ବା ଅପଲୋଡ଼ ଆରମ୍ଭ କରନ୍ତୁ । ଏବେ ଆପଣଙ୍କ ପାଖରେ କୌଣସି ପ୍ରଗତିରତ କାର୍ଯ୍ୟ ଡ୍ରାଫ୍ଟ ଭାବରେ ନାହିଁ"}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"ପାଠ୍ୟପୁସ୍ତକଗୁଡ଼ିକ","ACTIVITY_TEXTBOOK_TITLE":"ପାଠ୍ୟପୁସ୍ତକ","chapter":"ଅଧ୍ୟାୟ","copyAsCourse":"କୋର୍ସ ଭାବରେ କପି କରନ୍ତୁ","desktop":{"deleteCollection":"{name} ପାଠ୍ୟପୁସ୍ତକ ଡିଲିଟ୍ କରିବା ଦ୍ୱାରା ଏହା ମାଇଁ ଡାଉନଲୋଡ୍ ରୁ ହଟିଯିବ । ଜାରି ରଖିବା ପାଇଁ ଡିଲିଟ୍ ଉପରେ କ୍ଲିକ୍ କରନ୍ତୁ","downloadBook":"ପାଠ୍ୟପୁସ୍ତକ ଡାଉନଲୋଡ୍ କରନ୍ତୁ","find_more":"{instance} ରେ ଅଧିକ ପାଠ୍ୟପୁସ୍ତକ ଓ କଣ୍ଟେଣ୍ଟ୍ ଦେଖନ୍ତୁ","updateTextbook":"ପାଠ୍ୟପୁସ୍ତକ ଅପଡେଟ୍ କରନ୍ତୁ"},"dialCodeDescription":"QR କୋଡ଼ 6 ଅଙ୍କର ଆକ୍ଷରିକ କୋଡ଼ ଅଟେ ଯାହା ଆପଣଙ୍କ ପାଠ୍ୟପୁସ୍ତକରେ QR କୋଡ଼ ଛବି ତଳେ ପାଇପାରିବେ","dialCodeDescriptionGetPage":"QR କୋଡ଼ 6 ଅଙ୍କର ଆକ୍ଷରିକ କୋଡ଼ ଅଟେ ଯାହା ଆପଣଙ୍କ ପାଠ୍ୟପୁସ୍ତକରେ ଥିବା QR କୋଡ଼ ଛବି ତଳେ ପାଇପାରିବେ ।","downloadBooks":"ଅଫଲାଇନ୍ ଥିବା ସମୟରେ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ବହି ଡାଉନଲୋଡ୍ କରନ୍ତୁ","fromTheTextBook":"ପାଠ୍ୟପୁସ୍ତକରୁ","getUnlimitedAccess":"ଆପଣଙ୍କ ମୋବାଇଲ ଫୋନରେ ଅସୀମିତ ଅଫଲାଇନ ପାଠ୍ୟପୁସ୍ତକ, ଲେସନ୍ ଏବଂ କୋର୍ସ ପାଆନ୍ତୁ","import":"ଅଫଲାଇନ୍ ଥିବା ସମୟରେ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ବହି ଡାଉନଲୋଡ୍ କରନ୍ତୁ","installAppDesc":"ଆପଣଙ୍କ ଡିଭାଇସରେ ଲେସନ୍, ପାଠ୍ୟପୁସ୍ତକ ଓ କଣ୍ଟେଣ୍ଟ୍ ଅଫଲାଇନରେ ରଖନ୍ତୁ","mynotebook":"ମୋ ନୋଟବୁକ୍","noBookfoundButtonText":"ଅଧିକ ପୁସ୍ତକ ଓ କଣ୍ଟେଣ୍ଟ୍ ଦେଖନ୍ତୁ","noBookfoundSubTitle":"ଆପଣଙ୍କ ବୋର୍ଡ ଅଧିକ ପୁସ୍ତକ ସାମିଲ କରିବ । {instance} ରେ ଅଧିକ ପୁସ୍ତକ ଓ କଣ୍ଟେଣ୍ଟ ଦେଖିବା ପାଇଁ ଏହି ବଟନ୍ ଟ୍ୟାପ୍ କରନ୍ତୁ","noBookfoundTitle":"ବୋର୍ଡ ପୁସ୍ତକ ସାମିଲ କରୁଛି","textbooks":"ପାଠ୍ୟପୁସ୍ତକ"}},"messages":{"stmsg":{"m0125":"ସଂସାଧନ, ପୁସ୍ତକ, କୋର୍ସ, ସଂଗ୍ରହ ସୃଷ୍ଟି କିମ୍ବା ଅପଲୋଡ଼ ଆରମ୍ଭ କରନ୍ତୁ । ଏବେ ଆପଣଙ୍କ ପାଖରେ କୌଣସି ପ୍ରଗତିରତ କାର୍ଯ୍ୟ ଡ୍ରାଫ୍ଟ ନାହିଁ"}}},"trk":{"frmelmnts":{"btn":{"enroll":"ପଢ଼ନ୍ତୁ","resumecourse":"ପଢ଼ିବା ପୁନଃଆରମ୍ଭ କରନ୍ତୁ","unenroll":"ବନ୍ଦ କରନ୍ତୁ"},"instn":{"t0062":"ଏହି ପାଠ୍ୟପୁସ୍ତକ ପାଇଁ ଆପଣ ଏବେ ପର୍ଯ୍ୟନ୍ତ କୌଣସି ଶିକ୍ଷା/ପଢ଼ିବା ବ୍ୟାଚ୍ ସୃଷ୍ଟି କରିନାହାଁନ୍ତି । ବ୍ୟାଚ୍ ସୃଷ୍ଟି କରନ୍ତୁ ଓ ଡାସବୋର୍ଡ ଯାଞ୍ଚ କରନ୍ତୁ","t0063":"ଆପଣ ଏବେ ପର୍ଯ୍ୟନ୍ତ କୌଣସି ପାଠ୍ୟପୁସ୍ତକ ସୃଷ୍ଟି କରିନାହାଁନ୍ତି । ପାଠ୍ୟପୁସ୍ତକ ସୃଷ୍ଟି କରନ୍ତୁ ଓ ଡାସବୋର୍ଡ ଯାଞ୍ଚ କରନ୍ତୁ"},"lbl":{"accessCourse":"ପାଠ୍ୟପୁସ୍ତକ ଆକ୍ସେସ୍ କରନ୍ତୁ","accessToLogin":"ପାଠ୍ୟପୁସ୍ତକ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରି ଶିକ୍ଷା/ପଢିବା ବ୍ୟାଚ୍ ରେ ଯୋଗ ଦେବାକୁ ପଡ଼ିବ","ActivityCourses":"ପାଠ୍ୟପୁସ୍ତକ","ACTIVITY_COURSE_TITLE":"ପାଠ୍ୟପୁସ୍ତକ","addCourse":"ପାଠ୍ୟପୁସ୍ତକ ଯୋଗ କରନ୍ତୁ","completedCourse":"ଶେଷ ହୋଇଥିବା ପାଠ୍ୟପୁସ୍ତକ","completingCourseSuccessfully":"ସଫଳତାର ସହ ଶିକ୍ଷା ଶେଷ କରିବା ପାଇଁ,","copyAsCourse":"ପାଠ୍ୟପୁସ୍ତକ ଭାବରେ କପି କରନ୍ତୁ","courseDetails":"ପାଠ୍ୟପୁସ୍ତକ ବିବରଣୀ","courses":"ପାଠ୍ୟପୁସ୍ତକ","coursestructure":"ଅଧ୍ୟାୟ","joinTrainingToAcessContent":"କଣ୍ଟେଣ୍ଟ ଆକ୍ସେସ୍ କରିବା ପାଇଁ, ଆପଣଙ୍କୁ ଶିକ୍ଷା ବ୍ୟାଚରେ ଯୋଗ ଦେବାକୁ ପଡ଼ିବ","moduleFinish":"ଆପଣ ଏହି ଅଧ୍ୟାୟ ଶେଷ କରିଛନ୍ତି","moduleProgress":"ଅଧ୍ୟାୟ ପ୍ରଗତି","mytrainings":"ମୋ ଡିଜିଟାଲ ପାଠ୍ୟପୁସ୍ତକଗୁଡ଼ିକ","nextModule":"ପରବର୍ତ୍ତୀ ଅଧ୍ୟାୟ","oneCourse":"ଡିଜିଟାଲ ପାଠ୍ୟପୁସ୍ତକ","prevModule":"ପୂର୍ବ ଅଧ୍ୟାୟ","sectionTitle":"ଡିଜିଟାଲ୍ ପାଠ୍ୟପୁସ୍ତକ","selectChapter":"ଅଧ୍ୟାୟ ଚୟନ କରନ୍ତୁ","trainingAttended":"ପଢ଼ି ସାରିଥିବା ପାଠ୍ୟପୁସ୍ତକ","courseContainCertificate":"ଏହି ଶିକ୍ଷା ଆପଣଙ୍କୁ ସାର୍ଟିଫିକେଟ୍ ଦେଇଥାଏ","courseDontContainCertificate":"ଏବେ ଏହି ଶିକ୍ଷା ଟାସ୍କରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ । ଟାସ୍କ ସୃଷ୍ଟିକର୍ତ୍ତା ପରେ ଏଥିରେ ସାର୍ଟିଫିକେଟ୍ ସାମିଲ କରିପାରନ୍ତି ।"},"tab":{"courses":"ଡିଜିଟାଲ ପାଠ୍ୟପୁସ୍ତକ"}},"messages":{"emsg":{"m0002":"ଏହି ପାଠ୍ୟପୁସ୍ତକ ଆଉ ଉପଲବ୍ଧ ନାହିଁ"},"fmsg":{"dataSettingNotSubmitted":"ପ୍ରୋଫାଇଲ୍ ସେୟାର୍ ସେଟିଂସ୍ ଅପଡେଟ୍ ହୋଇ ପାରୁନାହିଁ । କିଛି ସମୟ ପରେ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ","m0001":"ଆମେ ଦୁଃଖିତ! ଆପଣ ଖୋଜୁଥିବା ପାଠ୍ୟପୁସ୍ତକ ଆମେ ପାଇଲୁ ନାହିଁ । କିଛି ସମୟ ପରେ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ","m0002":"ଆମେ ଦୁଃଖିତ ! ଆପଣଙ୍କ ପାଇଁ ଅନ୍ୟ ପାଠ୍ୟପୁସ୍ତକ ମିଳିଲା ନାହିଁ । ପରେ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ","m0086":"ଏହି ପାଠ୍ୟପୁସ୍ତକ ଆଉ ଉପଲବ୍ଧ ନାହିଁ"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"TV କ୍ଲାସଗୁଡ଼ିକ","ACTIVITY_TEXTBOOK_TITLE":"TV କ୍ଲାସଗୁଡ଼ିକ","ACTIVITY_TV_CLASS_TITLE":"TV କ୍ଲାସଗୁଡ଼ିକ","chapter":"TV କାର୍ଯ୍ୟକ୍ରମ","collection_tv_classes":"TV କ୍ଲାସଗୁଡ଼ିକ","desktop":{"downloadBook":"TV କ୍ଲାସଗୁଡ଼ିକ ଡାଉନଲୋଡ଼୍ କରନ୍ତୁ","downloadTVclasses":"TV କ୍ଲାସଗୁଡ଼ିକ ଡାଉନଲୋଡ଼୍ କରନ୍ତୁ","find_more":"{instance} ରେ ଅଧିକ TV କ୍ଲାସ୍ ଓ ସେ ସମ୍ପର୍କିତ କଣ୍ଟେଣ୍ଟ୍ ଦେଖନ୍ତୁ","find_more_TVclasses":"{instance} ରେ ଅଧିକ TV କ୍ଲାସ୍ ଓ ସେ ସମ୍ପର୍କିତ କଣ୍ଟେଣ୍ଟ୍ ଦେଖନ୍ତୁ","updateTextbook":"TV କ୍ଲାସଗୁଡ଼ିକ ଅପଡ଼େଟ୍ କରନ୍ତୁ","updateTVclasses":"TV କ୍ଲାସଗୁଡ଼ିକ ଅପଡ଼େଟ୍ କରନ୍ତୁ"},"downloadBooks":"ଅଫଲାଇନ ଥିବା ସମୟରେ ଆକ୍ସେସ୍ କରିବା ପାଇଁ TV କ୍ଲାସଗୁଡ଼ିକ ଡାଉନଲୋଡ଼୍ କରନ୍ତୁ","downloadTVclasses":"ଅଫଲାଇନ ଥିବା ସମୟରେ ଆକ୍ସେସ୍ କରିବା ପାଇଁ TV କ୍ଲାସଗୁଡ଼ିକ ଡାଉନଲୋଡ଼୍ କରନ୍ତୁ","fromTheTextBook":"TV କ୍ଲାସରୁ","fromTheTVclasses":"TV କ୍ଲାସରୁ","noBookfoundTitle":"ବୋର୍ଡ TV କ୍ଲାସ ଯୋଗ କରୁଛି","textbooks":"TV କ୍ଲାସଗୁଡ଼ିକ","TVclassesfoundTitle":"ବୋର୍ଡ TV କ୍ଲାସ ଯୋଗ କରୁଛି","tv_classes":"TV କ୍ଲାସଗୁଡ଼ିକ","tv_program":"TV କାର୍ଯ୍ୟକ୍ରମ"}}},"trk":{"frmelmnts":{"btn":{"enroll":"ଦେଖନ୍ତୁ","resumecourse":"ଦେଖିବା ପୁନଃଆରମ୍ଭ କରନ୍ତୁ"},"instn":{"t0062":"ଏହି TV କ୍ଲାସ୍ ପାଇଁ ଆପଣ ଏବେ ପର୍ଯ୍ୟନ୍ତ କୌଣସି ଶିକ୍ଷା ବ୍ୟାଚ୍ ସୃଷ୍ଟି କରିନାହାଁନ୍ତି । ବ୍ୟାଚ୍ ସୃଷ୍ଟି କରନ୍ତୁ ଓ ଡାସବୋର୍ଡ ଯାଞ୍ଚ କରନ୍ତୁ","t0063":"ଆପଣ ଏବେ ପର୍ଯ୍ୟନ୍ତ କୌଣସି TV କ୍ଲାସ୍ ସୃଷ୍ଟି କରିନାହାଁନ୍ତି । ଗୋଟିଏ TV କ୍ଲାସ୍ ସୃଷ୍ଟି କରନ୍ତୁ ଏବଂ ଡ୍ୟାସବୋର୍ଡ ଯାଞ୍ଚ କରନ୍ତୁ"},"lbl":{"accessCourse":"TV କ୍ଲାସଗୁଡ଼ିକ ଆକ୍ସେସ୍ କରନ୍ତୁ","accessToLogin":"TV କ୍ଲାସ୍ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରି ଶିକ୍ଷା ବ୍ୟାଚ୍ ରେ ଯୋଗ ଦେବାକୁ ପଡ଼ିବ","ActivityCourses":"TV କ୍ଲାସଗୁଡ଼ିକ","ACTIVITY_COURSE_TITLE":"TV କ୍ଲାସଗୁଡ଼ିକ","addCourse":"TV କ୍ଲାସ୍ ଯୋଗ କରନ୍ତୁ","completedCourse":"ଶେଷ କରିଥିବା TV କ୍ଲାସଗୁଡ଼ିକ","copyAsCourse":"TV କ୍ଲାସ୍ ଭାବରେ କପି କରନ୍ତୁ","courseContainCertificate":"ଏହି ଶିକ୍ଷା ଆପଣଙ୍କୁ ସାର୍ଟିଫିକେଟ୍ ଦେଇଥାଏ","courseDetails":"TV କ୍ଲାସ୍ ବିବରଣୀ","courses":"TV କ୍ଲାସଗୁଡ଼ିକ","coursestructure":"TV କାର୍ଯ୍ୟକ୍ରମ","moduleFinish":"ଆପଣ ଏହି କାର୍ଯ୍ୟକ୍ରମ ଶେଷ କରିଛନ୍ତି","moduleProgress":"କାର୍ଯ୍ୟକ୍ରମ ପ୍ରଗତି","mytrainings":"ମୋର TV କ୍ଲାସଗୁଡ଼ିକ","nextModule":"ପରବର୍ତ୍ତୀ କାର୍ଯ୍ୟକ୍ରମ","oneCourse":"TV କ୍ଲାସ୍","prevModule":"ପୂର୍ବ କାର୍ଯ୍ୟକ୍ରମ","sectionTitle":"TV କ୍ଲାସଗୁଡ଼ିକ","selectChapter":"କାର୍ଯ୍ୟକ୍ରମ ଚୟନ କରନ୍ତୁ","trainingAttended":"ଦେଖିଥିବା TV କ୍ଲାସ୍","courseDontContainCertificate":"ଏବେ ଏହି ଶିକ୍ଷା ଟାସ୍କରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ । ଟାସ୍କ ସୃଷ୍ଟିକର୍ତ୍ତା ପରେ ଏଥିରେ ସାର୍ଟିଫିକେଟ୍ ସାମିଲ କରିପାରନ୍ତି"},"tab":{"courses":"TV କ୍ଲାସଗୁଡ଼ିକ"}},"messages":{"emsg":{"m0002":"ଏହି TV କ୍ଲାସ୍ ଟାସ୍କ ଆଉ ଉପଲବ୍ଧ ନାହିଁ"},"fmsg":{"m0001":"ଆମେ ଦୁଃଖିତ! ଆପଣ ଖୋଜୁଥିବା TV କ୍ଲାସଗୁଡ଼ିକୁ ଆମେ ପାଇଲୁ ନାହିଁ । କିଛି ସମୟ ପରେ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ","m0002":"ଆମେ ଦୁଃଖିତ ! ଆପଣଙ୍କ ପାଇଁ ଅନ୍ୟ TV କ୍ଲାସ୍ ମିଳିଲା ନାହିଁ । ପରେ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ","m0086":"ଏହି TV କ୍ଲାସ୍ ଆଉ ଉପଲବ୍ଧ ନାହିଁ"}}}}}
\ No newline at end of file
diff --git a/utils/portal/labels/all_labels_ta.json b/utils/portal/labels/all_labels_ta.json
new file mode 100644
index 000000000..d49f88f19
--- /dev/null
+++ b/utils/portal/labels/all_labels_ta.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"உருவாக்கு"},"lbl":{"ActivityTextbooks":"பணிகள்","ACTIVITY_TEXTBOOK_TITLE":"பணிகள்","chapter":"கற்றல் மாடுயூல்","collection_task":"பணிகள்","desktop":{"download":"பதிவிறக்கம்","downloadBook":"பதிவிறக்கம்","find_more":"மேலும் உள்ளடக்கத்தைக் கண்டறியவும்","find_more_tasks":"மேலும் உள்ளடக்கத்தைக் கண்டறியவும்","update":"புதுப்பிப்பு","updateTextbook":"புதுப்பித்தல்"},"downloadBooks":"ஆஃப்லைனில் அணுக பதிவிறக்கவும்","downloadoffline":"ஆஃப்லைனில் அணுக பதிவிறக்கவும்","download_to_access_offline":"ஆஃப்லைனில் அணுக பதிவிறக்கவும்","fromTheLearningTask":"கற்றல் பணியிலிருந்து","fromTheTextBook":"கற்றல் பணியிலிருந்து","import":"ஆஃப்லைனில் அணுக பதிவிறக்கவும்","learningmodule":"கற்றல் மாடுயூல்","mynotebook":"எனது குறிப்பேடு","noBookfoundButtonText":"மேலும் பார்க்க","noBookfoundSubTitle":"உங்கள் கல்வி வாரியம் இன்னும் உள்ளடக்கத்தைச் சேர்க்கவில்லை.  {instance} இல் கூடுதல் உள்ளடக்கத்தைக் காண பொத்தானைத் தட்டவும்","noBookfoundTitle":"வாரியம் உள்ளடக்கத்தைச் சேர்க்கிறது","noTaskfoundSubTitle":"உங்கள் போர்டு இன்னும் உள்ளடக்கத்தைச் சேர்க்கவில்லை.  {instance}  இல் கூடுதல் உள்ளடக்கத்தைக் காண பொத்தானைத் தட்டவும்","noTaskfoundTitle":"வாரியம் உள்ளடக்கத்தைச் சேர்க்கிறது","seemore":"மேலும்  பார்க்க","task":"பணிகள்","tasks":"பணிகள்","task_title":"பணிகள்","textbooks":"பணிகள்"}},"messages":{"stmsg":{"m0125":"உள்ளடக்கத்தை உருவாக்க அல்லது பதிவேற்றத் தொடங்குங்கள். உங்களிடம் தற்போது எந்த உள்ளடக்கமும் வரைவாக சேமிக்கப்படவில்லை","ms0001":"உள்ளடக்கத்தை உருவாக்க அல்லது பதிவேற்றத் தொடங்குங்கள். உங்களிடம் தற்போது எந்த உள்ளடக்கமும் வரைவாக சேமிக்கப்படவில்லை"}}},"trk":{"completed_learning":"கற்றல் முடிந்தது","essages":{"fmsg":{"m0082":"இந்த கற்றல் பணி இன்னும் திறக்கப்படவில்லை. நீங்கள் அதில் சேர முடியாது"}},"frmelmnts":{"btn":{"create":"உருவாக்கு","enroll":"சேர்","resumecourse":"தற்குறிப்பு","unenroll":"விடுங்கள்","viewcoursestats":"புள்ளிவிவரங்களை காண","viewCourseStatsDashboard":"டாஷ்போர்டைக் காண்க"},"instn":{"t0062":"இந்த பணிக்காக நீங்கள் இதுவரை எந்த தொகுப்பையும் உருவாக்கவில்லை. ஒரு பணியை உருவாக்கி டாஷ்போர்டை சரிபார்க்கவும்","t0063":"நீங்கள் இதுவரை எந்த பணியையும் உருவாக்கவில்லை. புதிய பணியை உருவாக்கி, டாஷ்போர்டை மீண்டும் சரிபார்க்கவும்."},"lbl":{"accessCourse":"கற்றல் பொருள் அணுக","accessToLogin":"உள்ளடக்கத்தை அணுக நீங்கள் உள்நுழைந்து பணியில் சேர வேண்டும்","ActivityCourses":"பணிகள்","ACTIVITY_COURSE_TITLE":"பணிகள்","addCourse":"சேர்","completedCourse":"முடிக்கப்பட்ட பணிகள்","completingCourseSuccessfully":"கற்றலை வெற்றிகரமாக முடிக்க,","copyAsCourse":"கற்றல் பொருளாக நகலெடுக்கவும்","courseContainCertificate":"இந்த கற்றல் உங்களுக்கு ஒரு சான்றிதழை வழங்குகிறது","courseDetails":"கற்றல் விவரங்கள்","courseProgress":"முன்னேற்றம்","courseRelevantFor":"இந்த கற்றல் இதற்கு பொருத்தமானது:","courses":"பணிகள்","coursestructure":"கற்றல் மாடுயூல்","courseSuccessMessage":"உங்கள் கற்றலை வெற்றிகரமாக முடித்துவிட்டீர்கள்","courseSuccessNotificationMessage":"உங்கள் பதிவு செய்யப்பட்ட தொடர்பு விவரங்களில் உங்கள் சான்றிதழ் குறித்து 7 நாட்களுக்குள் உங்களுக்கு அறிவிக்கப்படும்","courseWithoutCertificateNote":"குறிப்பு: இந்த கற்றல் உங்களுக்கு சான்றிதழை வழங்காது","dashboardnocourseselected":"தேர்வு எதுவும் செய்யப்படவில்லை","dashboardnocourseselecteddesc":"பட்டியலிலிருந்து தேர்ந்தெடுக்கவும்","downloadCourseQRCode":"QR குறியீட்டைப் பதிவிறக்கவும்","downloadQRCode":{"tooltip":"QR குறியீடுகளைப் பதிவிறக்க கிளிக் செய்து அவற்றை உங்கள் வெளியீட்டில் இணைக்கவும்"},"getUnlimitedAccess":"உங்க காய்பேசியில் பாடப்புத்தகங்கள், டிவி  வகுப்புகள் மற்றும் பாடநெறிகளை ஆஃப்லைனில்   வரம்பற்ற அணுகலைப் பெறுங்கள்","joinTrainingToAcessContent":"உள்ளடக்கத்தை அணுக, நீங்கள் உள்நுழைந்து பணியில் சேர வேண்டும்","moduleFinish":"இந்த பணியை முடித்துவிட்டீர்கள்","moduleProgress":"பணி முன்னேற்றம்","mytrainings":"எனது பணிகள்","nextModule":"அடுத்த பணி","oneCourse":"பணி","prevModule":"முந்தைய. பணி","returnToCourses":"பின்","sectionTitle":"பணிகள்","selectChapter":"பணியைத் தேர்ந்தெடுக்கவும்","selectContentFromCourse":"உள்ளடக்கங்களைத் தேர்ந்தெடுக்கவும்","trainingAttended":"கற்றல் கலந்து கொண்டது","courseDontContainCertificate":"தற்போது, ​​இந்த கற்றல் பணிக்கு சான்றிதழ் இல்லை. பணியை உருவாக்கியவர் பின்னர் ஒரு சான்றிதழை இணைக்கலாம்."},"tab":{"courses":"பணிகள்"}},"messages":{"dashboard":{"emsg":{"m002":"இந்த கற்றல் பணிக்காக பயனர் எந்த தொகுப்பிலும் சேரவில்லை"}},"emsg":{"m0002":"இந்த கற்றல் பணி இனி கிடைக்காது","m0003":"இந்த கற்றல் பணிக்கு திறந்த தொகுதி இல்லை"},"fmsg":{"dataSettingNotSubmitted":"சுயவிவரப் பகிர்வு அமைப்புகளைப் புதுப்பிக்க முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்","m0001":"மன்னிக்கவும்! நீங்கள் பதிவுசெய்த கற்றல் பணிக்கான தகவல்களை நாங்கள் பெற முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்","m0002":"மன்னிக்கவும்! உங்களுக்காக பிற கற்றல் பணிகளை எங்களால் பெற முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்","m0086":"இந்த உள்ளடக்கம் இனி கிடைக்காது"},"imsg":{"m0001":"இந்த உள்ளடக்கம் பொருத்தமற்றது என கொடியிடப்பட்டுள்ளது. இது தற்போது மதிப்பாய்வில் உள்ளது","m0026":"வணக்கம், இந்த உள்ளடக்கம் தற்போது கிடைக்கவில்லை. இது மாற்றத்திற்கு உள்ளாகலாம்"},"stmsg":{"m0125":"உள்ளடக்கத்தை உருவாக்க அல்லது பதிவேற்றத் தொடங்குங்கள். தற்போது நீங்கள் எந்த உள்ளடக்கத்தையும் சேமிக்கவில்லை"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"பாடநெறிகள்","ACTIVITY_TEXTBOOK_TITLE":"பாடநெறிகள்","chapter":"பாடநெறி மாடுயூல்","desktop":{"downloadBook":"பாடநெறிகளை பதிவிறக்க","find_more":"{instance} இல் கூடுதல் பாடநெறிகள் மற்றும் தொடர்புடைய உள்ளடக்கத்தைக் கண்டறியவும்","updateTextbook":"பாடநெறியை புதுப்பிக்கவும்"},"downloadBooks":"ஆஃப்லைனில் இருக்கும்போது அணுக படிப்புகளைப் பதிவிறக்கவும்","fromTheTextBook":"பாடநெறியிலிருந்து","noBookfoundTitle":"வாரியம் படிப்புகளைச் சேர்க்கிறது","textbooks":"பாடநெறிகள்"}}},"trk":{"completedCourse":"பாடநெறிகள் வெற்றிகரமாக முடித்துவிட்டீர்கள்","frmelmnts":{"btn":{"createCourse":"பாடநெறி உருவாக்குங்கள்","enroll":"பாடநெறியில் இணையுங்கள்","resumecourse":"பாடநெறியை தொடரு","unenroll":"பாடநெறியில் இருந்து விலகு","viewcoursestats":"பாடநெறியின் புள்ளிவிவரங்களை காண","viewCourseStatsDashboard":"டாஷ்போர்டைக் காண்க"},"instn":{"t0062":"இந்த பாடநெறிக்கான  தொகுப்பை நீங்கள் இன்னும் உருவாக்கவில்லை. புதிய தொகுப்பை உருவாக்கியப் பின்னர் DASHBOARD (டாஷ்போர்ட்) ஐ  மீண்டும் சரிபார்க்கவும்","t0063":"நீங்கள் இதுவரை எந்த பாடநெறியையும் உருவாக்கவில்லை. புதிய பாடநெறியை உருவாக்கியபின் dashboard (தாஷ்போர்ட்)  ஐ  பார்க்கவும்"},"lbl":{"accessCourse":"பாடநெறியை அணுக","accessToLogin":"பாடநெறிகளை அணுக நீங்கள் உள்நுழைந்து பாடநெறியில்  சேர வேண்டும்","ActivityCourses":"பாடநெறிகள்","ACTIVITY_COURSE_TITLE":"பாடநெறிகள்","addCourse":"பாடநெறியை சேர்க்கவும்","completedCourse":"பாடநெறிகள் முடிவடைந்தது","completingCourseSuccessfully":"பயிற்சியை வெற்றிகரமாக முடிக்க","copyAsCourse":"பாடநெறிகளாக நகலெடுக்கவும்","courseContainCertificate":"இது ஒரு சான்றிதழ் பெறக்கூடிய பாடநெறியாகும்","courseDetails":"பாடநெறியின் விவரங்கள்","courseDontContainCertificate":"தற்போது, ​​இந்த பாடநெறிக்கு சான்றிதழ் இல்லை. பாடநெறி உருவாக்கியவர் பின்னர் ஒரு சான்றிதழை இணைக்கலாம்.","courseLastUpdatedOn":"கடைசியாக புதுப்பிக்கப்பட்டது நாள்","courseProgress":"பாடநெறியில் உங்கள்  முன்னேற்றம்","courseRelevantFor":"பாடநெறி இதற்கு பொருத்தமானது:","courses":"பாடநெறிகள்","coursestructure":"பாடநெறி மாடியுள்கள்","courseSuccessMessage":"இந்த பாடநெறியை வெற்றிகரமாக முடித்துவிட்டீர்கள்","courseSuccessNotificationMessage":"உங்கள் பதிவு செய்யப்பட்ட தொடர்பு விவரங்களில் 7 நாட்களுக்குள் பாட சான்றிதழ் குறித்து உங்களுக்கு அறிவிக்கப்படும்","courseWithoutCertificateNote":"குறிப்பு: இந்த பாடநெறிக்கு சான்றிதழ் இல்லை","dashboardnocourseselected":"எந்த பாடநெறியும் தேர்வுசெய்யப்படவில்லை","dashboardnocourseselecteddesc":"மேற்கண்ட பட்டியலில் இருந்து பாடநெறியை தேர்வு செய்யவும்","downloadCourseQRCode":"பாடநெறி QR குறியீட்டைப் பதிவிறக்கவும்","downloadQRCode":{"tooltip":"QR குறியீடுகளைப் பதிவிறக்க கிளிக் செய்து அவற்றை வெளியிடப்பட்ட பாடத்திட்டத்துடன் இணைக்கவும்"},"enrollcourse":"பாடநெறியில் இணை","getUnlimitedAccess":"உங்கள் கைப்பேசியில் பாடப்புத்தகங்கள், பாடங்கள் மற்றும் பயிற்சிகள் ஆகியவற்றை ஆஃப்லைனில்  வரம்பற்று அணுகுங்கள்.","joinTrainingToAcessContent":"உள்ளடக்கத்திற்கான முழுமையான அணுகலைப் பெற நீங்கள் பாடநெறியில் சேரவேண்டும்.","moduleFinish":"இந்த அத்தியாயத்தை முடித்துவிட்டீர்கள்","moduleProgress":"மாடுயூல் முன்னேற்றம்","mytrainings":"என் பாடநெறிகள்","nextModule":"அடுத்த மாடுயூல்","oneCourse":"பாடநெறி","prevModule":"முந்தைய மாடுயூல்","returnToCourses":"பாடநெறிகளுக்குத் திரும்பு","sectionTitle":"பாடநெறிகள்","selectChapter":"மாடுயூலை  தேர்ந்தெடுக்கவும்","selectContentFromCourse":"பாடநெறிக்கான  உள்ளடக்கங்களைத் தேர்ந்தெடுக்கவும்","signinenrollTitle":"இந்த பாடநெறிக்குத் தங்களை பதிவுசெய்துக்கொள்ள உள்நுழையவும்","trainingAttended":"பங்குபெற்ற பாடநெறிகள்","userName":"பயனர் பெயர்"},"tab":{"courses":"பாடநெறிகள்"}},"messages":{"dashboard":{"emsg":{"m002":"இந்த பாடநெறியின் எந்த தொகுப்பிலும் பயனர் தன்னை பதிவு செய்யுதுக்கொள்ளவில்லை"}},"emsg":{"m0002":"பாடநெறி இனி இல்லை","m0003":"இந்த பாடநெறியில் தொகுதிகள் எதுவும் இல்லை"},"fmsg":{"m0001":"பதிவுசெய்யப்பட்ட பாடநெறிகளை பெறமுடியவில்லை, தயவுசெய்து பின்னர் முயற்சிக்கவும்","m0002":"மற்ற பாடநெறிகளை  பெறமுடியவில்லை , தயவுசெய்து பின்னர் முயற்சிக்கவும்","m0082":"இந்த பாடநெறி சேர்க்கைக்கு திறக்கப்படவில்லை","m0086":"ஆசிரியரால் நீக்கப்பட்ட  இந்த பாடநெறி இனி கிடைக்காது"},"imsg":{"m0001":"இந்த பாடநெறி  பொருத்தமற்றதாக குறியிடப்பட்டு தற்போது  மறு ஆய்வு செய்யப்படுகிறது. தயவு செய்து  பின்னர் முயற்சிக்கவும்","m0026":"வணக்கம், இப்பொழுது இந்தப் பாடநெறி  கிடைக்கவில்லை. படைப்பாளர் இந்த பாடநெறியில்   சில மாற்றங்களை செய்துள்ளார் என காணப்படுகிறது."},"stmsg":{"m0125":"வளம், புத்தகம், பாடம், சேகரிப்பு அல்லது  பதிவேற்றத்தை உருவாக்க தொடங்கவும். தற்போது வேலைக்கு முன்னேற்ற வரைவு எதுவும் இல்லை"}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"பாடப்புத்தகங்கள்","ACTIVITY_TEXTBOOK_TITLE":"பாடப்புத்தகங்கள்","chapter":"அத்தியாயம்","copyAsCourse":"பாடநெறிகளை நகலெடு","desktop":{"deleteCollection":"{name} பாடப்புத்தகத்தை நீக்குவது எனது பதிவிறக்கங்களிலிருந்து அதை நீக்குகிறது. தொடர நீக்கு என்பதைக் கிளிக் செய்க.","downloadBook":"பாடப்புத்தகத்தை பதிவிறக்கவும்","find_more":"மேலும் பாடபுத்தகங்கள்  மற்றும் உள்ளடக்கங்களை {instance} வில் பெறுங்கள்","updateTextbook":"பாடப்புத்தகத்தை புதுப்பிக்கவும்"},"dialCodeDescription":"QR குறியீடு என்பது உங்கள் பாடப்புத்தகத்தில்  QR  குறீயீட்டின் கீழ் காணப்படும் 6 இலக்க  எண்ணெழுத்து  குறியீடாகும் .","dialCodeDescriptionGetPage":"QR குறியீடு என்பது உங்கள் பாடப்புத்தகத்தில்  QR  குறீயீட்டின் கீழ் காணப்படும் 6 இலக்க  எண்ணெழுத்து  குறியீடாகும்.","downloadBooks":"ஆஃப்லைனில் இருக்கும்போது அணுக புத்தகங்களைப் பதிவிறக்கவும்","fromTheTextBook":"பாடப்புத்தகத்தில் இருந்து","getUnlimitedAccess":"உங்கள் கைப்பேசியில் பாடப்புத்தங்கள், பாடங்கள் மற்றும் பயிற்சிகள் ஆகியவற்றை ஆஃப்லைனில் வரம்பற்று அணுகுங்கள்.","import":"ஆஃப்லைனில் இருக்கும்போது அணுக புத்தகங்களைப் பதிவிறக்கவும்","installAppDesc":"பாடங்கள், பாடப்புத்தகங்கள் மற்றும் உள்ளடக்கத்தை ஆஃப்லைனில் உங்கள் சாதனத்தில் சேமிக்கவும்","mynotebook":"எனது குறிப்பேடு","noBookfoundButtonText":"மேலும் புத்தகங்கள் மட்டும் உள்ளடக்கத்தைப் பாருங்கள்","noBookfoundSubTitle":"உங்களது கல்வி வாரியம் இன்னும் அதிக புத்தகங்களை இணைக்கவுள்ளது. மேலும் புத்தகங்கள் மட்டும் பாடங்களை {instance}இல் காண, இந்த பொத்தானை அழுத்தவும்.","noBookfoundTitle":"கல்வி வாரியம் மேலும் புத்தகங்களை இணையக்க உள்ளது.","textbooks":"பாடப்புத்தகங்கள்"}},"messages":{"stmsg":{"m0125":"வளம், புத்தகம், பாடம், சேகரிப்பு அல்லது  பதிவேற்றத்தை உருவாக்க தொடங்கவும். தற்போது வேலைக்கு முன்னேற்ற வரைவு எதுவும் இல்லை"}}},"trk":{"frmelmnts":{"btn":{"enroll":"படி","resumecourse":"வாசிப்பை மீண்டும் தொடங்குங்கள்","unenroll":"மூடு"},"instn":{"t0062":"இந்த பாடப்புத்தகத்திற்கான கற்றல் / வாசிப்பு தொகுதியை நீங்கள் இதுவரை உருவாக்கவில்லை. ஒரு தொகுதியை உருவாக்கி டாஷ்போர்டை சரிபார்க்கவும்","t0063":"நீங்கள் இதுவரை எந்த பாடப்புத்தகத்தையும் உருவாக்கவில்லை. ஒரு பாடப்புத்தகத்தை உருவாக்கி டாஷ்போர்டை சரிபார்க்கவும்"},"lbl":{"accessCourse":"பாடப்புத்தகத்தை அணுகவும்","accessToLogin":"பாடப்புத்தகத்தை அணுக நீங்கள் உள்நுழைந்து கற்றல் / வாசிப்பு தொகுப்பில் சேர வேண்டும்","ActivityCourses":"பாடப்புத்தகம்","ACTIVITY_COURSE_TITLE":"பாடப்புத்தகம்","addCourse":"பாடப்புத்தகத்தைச் சேர்க்கவும்","completedCourse":"பாடப்புத்தகங்கள் நிறைவு","completingCourseSuccessfully":"கற்றலை வெற்றிகரமாக முடிக்க,","copyAsCourse":"பாடப்புத்தகமாக நகலெடுக்கவும்","courseDetails":"பாடப்புத்தக விவரங்கள்","courses":"பாடப்புத்தகங்கள்","coursestructure":"அத்தியாயம்","joinTrainingToAcessContent":"உள்ளடக்கத்தை அணுக, நீங்கள் கற்றல் தொகுப்பில் சேர வேண்டும்","moduleFinish":"இந்த அத்தியாயத்தை முடித்துவிட்டீர்கள்","moduleProgress":"அத்தியாயம் முன்னேற்றம்","mytrainings":"எனது டிஜிட்டல் பாடப்புத்தகங்கள்","nextModule":"அடுத்த அத்தியாயம்","oneCourse":"டிஜிட்டல் பாடப்புத்தகம்","prevModule":"முந்தைய. அத்தியாயம்","sectionTitle":"டிஜிட்டல் பாடப்புத்தகம்","selectChapter":"அத்தியாயத்தைத் தேர்ந்தெடுக்கவும்","trainingAttended":"படித்த பாடப்புத்தகங்கள்","courseContainCertificate":"இந்த கற்றல் உங்களுக்கு ஒரு சான்றிதழை வழங்குகிறது","courseDontContainCertificate":"தற்போது, ​​இந்த கற்றல் பணிக்கு சான்றிதழ் இல்லை. பணியை உருவாக்கியவர் பின்னர் ஒரு சான்றிதழை இணைக்கலாம்."},"tab":{"courses":"டிஜிட்டல் பாடப்புத்தகம்"}},"messages":{"emsg":{"m0002":"இந்த பாடப்புத்தகம் இனி கிடைக்காது"},"fmsg":{"dataSettingNotSubmitted":"சுயவிவரப் பகிர்வு அமைப்புகளைப் புதுப்பிக்க முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்","m0001":"மன்னிக்கவும்! நீங்கள் தேடும் பாடப்புத்தகத்தை எங்களால் பெற முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்","m0002":"மன்னிக்கவும்! உங்களுக்காக பிற பாடப்புத்தகங்களை எங்களால் பெற முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்","m0086":"இந்த பாடப்புத்தகம் இனி கிடைக்காது"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"தொலைக்காட்சி வகுப்புகள்","ACTIVITY_TEXTBOOK_TITLE":"டிவி வகுப்புகள்","ACTIVITY_TV_CLASS_TITLE":"தொலைக்காட்சி வகுப்புகள்","chapter":"டிவி  நிகழ்ச்சி","collection_tv_classes":"டிவி வகுப்புகள்","desktop":{"downloadBook":"டிவி வகுப்புகளைப் பதிவிறக்குக","downloadTVclasses":"தொலைக்காட்சிவகுப்புகளைப் பதிவிறக்குக","find_more":"{instance} ல் மேலும் தொலைக்காட்சி வகுப்புகள் மற்றும் தொடர்புடைய உள்ளடக்கத்தைக் கண்டறியவும்","find_more_TVclasses":"{instance} இல் மேலும் தொலைக்காட்சி வகுப்புகள் மற்றும் தொடர்புடைய உள்ளடக்கத்தைக் கண்டறியவும்","updateTextbook":"டிவி வகுப்புகளைப் புதுப்பிக்கவும்","updateTVclasses":"தொலைக்காட்சி வகுப்புகளைப் புதுப்பிக்கவும்"},"downloadBooks":"ஆஃப்லைனில் இருக்கும்போது அணுக டிவி வகுப்புகளைப் பதிவிறக்குக","downloadTVclasses":"ஆஃப்லைனில் இருக்கும்போது அணுக தொலைக்காட்சி வகுப்புகளைப் பதிவிறக்குக","fromTheTextBook":"டிவி வகுப்பிலிருந்து","fromTheTVclasses":"தொலைக்காட்சி வகுப்பிலிருந்து","noBookfoundTitle":"உங்கள் வாரியம் டிவி வகுப்பை சேர்க்கிறது","textbooks":"டிவி வகுப்புகள்","TVclassesfoundTitle":"போர்டு  தொலைக்காட்சிவகுப்பைச் சேர்க்கிறது","tv_classes":"தொலைக்காட்சி வகுப்புகள்","tv_program":"தொலைக்காட்சி நிகழ்ச்சி"}}},"trk":{"frmelmnts":{"btn":{"enroll":"பாருங்கள்","resumecourse":"பார்ப்பதை மீண்டும் தொடங்குங்கள்"},"instn":{"t0062":"இந்த தொலைக்காட்சி வகுப்பிற்காக நீங்கள் இதுவரை எந்த கற்றல் தொகுதியையும் உருவாக்கவில்லை. ஒரு தொகுதியை உருவாக்கி டாஷ்போர்டை சரிபார்க்கவும்","t0063":"நீங்கள் இதுவரை எந்த டிவி  வகுப்பையும் உருவாக்கவில்லை.டிவி வகுப்பை உருவாக்கி டாஷ்போர்டை சரிபார்க்கவும்"},"lbl":{"accessCourse":"டிவி  வகுப்புகளை அணுகவும்","accessToLogin":"டிவி வகுப்பை அணுக நீங்கள் உள்நுழைந்து கற்றல் தொகுப்பில் சேர வேண்டும்","ActivityCourses":"டிவி வகுப்புகள்","ACTIVITY_COURSE_TITLE":"டிவி வகுப்புகள்","addCourse":"டிவி வகுப்பைச் சேர்க்கவும்","completedCourse":"டிவி வகுப்புகள் முடிவடைந்தது","copyAsCourse":"டிவி வகுப்பாக நகலெடுக்கவும்","courseContainCertificate":"இந்த கற்றல் உங்களுக்கு ஒரு சான்றிதழை வழங்குகிறது","courseDetails":"டிவி  வகுப்பு விவரங்கள்","courses":"டிவி வகுப்புகள்","coursestructure":"தொலைக்காட்சி நிகழ்ச்சி","moduleFinish":"இந்த திட்டத்தை முடித்துவிட்டீர்கள்","moduleProgress":"நிரல் முன்னேற்றம்","mytrainings":"எனது  தொலைக்காட்சி வகுப்புகள்","nextModule":"அடுத்த நிரல்","oneCourse":"டிவி  வகுப்பு","prevModule":"முந்தைய நிரல்","sectionTitle":"தொலைக்காட்சி வகுப்புகள்","selectChapter":"நிரலைத் தேர்ந்தெடுக்கவும்","trainingAttended":"பார்த்த டிவி வகுப்புகள்","courseDontContainCertificate":"தற்போது, ​​இந்த கற்றல் பணிக்கு சான்றிதழ் இல்லை. பணியை உருவாக்கியவர் பின்னர் ஒரு சான்றிதழை இணைக்கலாம்."},"tab":{"courses":"தொலைக்காட்சி வகுப்புகள்"}},"messages":{"emsg":{"m0002":"இந்த டிவி வகுப்பு பணி இனி கிடைக்காது"},"fmsg":{"m0001":"மன்னிக்கவும்! நீங்கள் தேடும்  டிவி  எங்களால் பெற முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்","m0002":"மன்னிக்கவும்! உங்களுக்காக பிற டிவி வகுப்புகளை எங்களால் பெற முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்","m0086":"இந்த டிவி வகுப்பு இனி கிடைக்காது"}}}}}
\ No newline at end of file
diff --git a/utils/portal/labels/all_labels_te.json b/utils/portal/labels/all_labels_te.json
new file mode 100644
index 000000000..598dc8892
--- /dev/null
+++ b/utils/portal/labels/all_labels_te.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"సృష్టించండి"},"lbl":{"ActivityTextbooks":"పనులు","ACTIVITY_TEXTBOOK_TITLE":"పనులు","chapter":"మాడ్యూల్ నేర్చుకోవడం","collection_task":"పనులు","desktop":{"download":"డౌన్‌లోడ్","downloadBook":"డౌన్‌లోడ్","find_more":"మరింత కంటెంట్‌ను కనుగొనండి","find_more_tasks":"మరింత కంటెంట్‌ను కనుగొనండి","update":"నవీకరణ","updateTextbook":"నవీకరణ"},"downloadBooks":"ఆఫ్‌లైన్‌లో ప్రాప్యత చేయడానికి డౌన్‌లోడ్ చేయండి","downloadoffline":"ఆఫ్‌లైన్‌లో ప్రాప్యత చేయడానికి డౌన్‌లోడ్ చేయండి","download_to_access_offline":"ఆఫ్‌లైన్‌లో ప్రాప్యత చేయడానికి డౌన్‌లోడ్ చేయండి","fromTheLearningTask":"అభ్యాస పని నుండి","fromTheTextBook":"అభ్యాస పని నుండి","import":"ఆఫ్‌లైన్‌లో ప్రాప్యత చేయడానికి డౌన్‌లోడ్ చేయండి","learningmodule":"మాడ్యూల్ నేర్చుకోవడం","mynotebook":"నా నోట్బుక్","noBookfoundButtonText":"ఇంకా చూడు","noBookfoundSubTitle":"మీ బోర్డు ఇంకా కంటెంట్‌ను జోడించలేదు. మరింత కంటెంట్ చూడటానికి {instance} బటన్ నొక్కండి","noBookfoundTitle":"బోర్డు కంటెంట్‌ను జోడిస్తోంది","noTaskfoundSubTitle":"మీ బోర్డు ఇంకా కంటెంట్‌ను జోడించలేదు.  మరింత కంటెంట్ చూడటానికి {instance} బటన్ నొక్కండి","noTaskfoundTitle":"బోర్డు కంటెంట్‌ను జోడిస్తోంది","seemore":"ఇంకా చూడు","task":"పనులు","tasks":"పనులు","task_title":"పనులు","textbooks":"పనులు"}},"messages":{"stmsg":{"m0125":"కంటెంట్‌ను సృష్టించడం లేదా అప్‌లోడ్ చేయడం ప్రారంభించండి.  మీకు ప్రస్తుతం డ్రాఫ్ట్ వలె సేవ్ చేయబడిన కంటెంట్ లేదు","ms0001":"కంటెంట్‌ను సృష్టించడం లేదా అప్‌లోడ్ చేయడం ప్రారంభించండి.  మీకు ప్రస్తుతం డ్రాఫ్ట్ వలె సేవ్ చేయబడిన కంటెంట్ లేదు"}}},"trk":{"completed_learning":"అభ్యాసం పూర్తయింది","essages":{"fmsg":{"m0082":"ఈ అభ్యాస పని ఇంకా తెరవలేదు.  మీరు అందులో చేరలేరు"}},"frmelmnts":{"btn":{"create":"సృష్టించండి","enroll":"చేరండి","resumecourse":"పునఃప్రారంభం","unenroll":"వదిలివేయండి","viewcoursestats":"గణాంకాలను చూడండి","viewCourseStatsDashboard":"డాష్‌బోర్డ్‌ను చూడండి"},"instn":{"t0062":"ఈ పని కోసం మీరు ఇంకా ఏ బ్యాచ్‌ను సృష్టించలేదు.  ఒక పనిని సృష్టించండి మరియు డాష్‌బోర్డ్‌ను తనిఖీ చేయండి","t0063":"మీరు ఇంకా ఏ పనిని సృష్టించలేదు.  క్రొత్త పనిని సృష్టించండి మరియు డాష్‌బోర్డ్‌ను మళ్లీ తనిఖీ చేయండి."},"lbl":{"accessCourse":"అభ్యాస సామగ్రిని యాక్సెస్ చేయండి","accessToLogin":"కంటెంట్‌ను యాక్సెస్ చేయడానికి మీరు లాగిన్ అయి పనిలో చేరాలి","ActivityCourses":"పనులు","ACTIVITY_COURSE_TITLE":"పనులు","addCourse":"జోడించు","completedCourse":"పూర్తి చేసిన పనులు","completingCourseSuccessfully":"నేర్చుకోవడం విజయవంతంగా పూర్తి చేయడానికి,","copyAsCourse":"అభ్యాస సామగ్రిగా కాపీ చేయండి","courseContainCertificate":"ఈ అభ్యాసం మీకు ధృవీకరణ పత్రాన్ని అందిస్తుంది","courseDetails":"వివరాలు నేర్చుకోవడం","courseProgress":"పురోగతి","courseRelevantFor":"ఈ అభ్యాసం వీటికి సంబంధించినది:","courses":"పనులు","coursestructure":"మాడ్యూల్ నేర్చుకోవడం","courseSuccessMessage":"మీరు మీ అభ్యాసాన్ని విజయవంతంగా పూర్తి చేసారు","courseSuccessNotificationMessage":"మీ రిజిస్టర్డ్ సంప్రదింపు వివరాలపై మీ సర్టిఫికేట్ గురించి 7 రోజుల్లో మీకు తెలియజేయబడుతుంది","courseWithoutCertificateNote":"గమనిక: ఈ అభ్యాసం మీకు సర్టిఫికేట్ ఇవ్వదు","dashboardnocourseselected":"ఎంపిక చేయలేదు","dashboardnocourseselecteddesc":"జాబితా నుండి ఎంచుకోండి","downloadCourseQRCode":"QR కోడ్‌ను డౌన్‌లోడ్ చేయండి","downloadQRCode":{"tooltip":"QR కోడ్‌లను డౌన్‌లోడ్ చేయడానికి క్లిక్ చేసి, వాటిని మీ ప్రచురణకు లింక్ చేయండి"},"getUnlimitedAccess":"మీ మొబైల్ ఫోన్‌లో పాఠ్యపుస్తకాలు, టీవీ తరగతులు మరియు కోర్సులకు ఆఫ్‌లైన్‌లో అపరిమిత ప్రాప్యతను పొందండి","joinTrainingToAcessContent":"కంటెంట్‌ను ప్రాప్యత చేయడానికి, మీరు లాగిన్ అయి పనిలో చేరాలి","moduleFinish":"మీరు ఈ పనిని పూర్తి చేసారు","moduleProgress":"పని పురోగతి","mytrainings":"నా పనులు","nextModule":"తదుపరి పని","oneCourse":"పని","prevModule":"మునుపటి.  పని","returnToCourses":"తిరిగి","sectionTitle":"పనులు","selectChapter":"విధిని ఎంచుకోండి","selectContentFromCourse":"విషయాలను ఎంచుకోండి","trainingAttended":"నేర్చుకోవడం హాజరయ్యారు","courseDontContainCertificate":"ప్రస్తుతం, ఈ అభ్యాస పనికి సర్టిఫికేట్ లేదు.  విధి సృష్టికర్త తరువాత ప్రమాణపత్రాన్ని అటాచ్ చేయవచ్చు"},"tab":{"courses":"పనులు"}},"messages":{"dashboard":{"emsg":{"m002":"ఈ అభ్యాస పని కోసం వినియోగదారు ఏ బ్యాచ్‌లోనూ చేరలేదు"}},"emsg":{"m0002":"ఈ అభ్యాస పని ఇకపై అందుబాటులో లేదు","m0003":"ఈ అభ్యాస పనికి ఓపెన్ బ్యాచ్ లేదు"},"fmsg":{"dataSettingNotSubmitted":"ప్రొఫైల్ వాటా సెట్టింగ్‌లను నవీకరించడం సాధ్యం కాలేదు.  తరువాత మళ్ళీ ప్రయత్నించండి","m0001":"క్షమించండి!  మీరు నమోదు చేసిన అభ్యాస పని కోసం మేము సమాచారాన్ని పొందుతాము.  తరువాత మళ్ళీ ప్రయత్నించండి","m0002":"క్షమించండి!  మేము మీ కోసం ఇతర అభ్యాస పనులను పొందలేకపోయాము.  తరువాత మళ్ళీ ప్రయత్నించండి","m0086":"ఈ కంటెంట్ ఇకపై అందుబాటులో లేదు"},"imsg":{"m0001":"ఈ కంటెంట్ అనుచితమైనదిగా ఫ్లాగ్ చేయబడింది.  ఇది ప్రస్తుతం సమీక్షలో ఉంది","m0026":"హాయ్, ఈ కంటెంట్ ప్రస్తుతం అందుబాటులో లేదు.  ఇది మార్పుకు లోనవుతుంది"},"stmsg":{"m0125":"కంటెంట్‌ను సృష్టించడం లేదా అప్‌లోడ్ చేయడం ప్రారంభించండి.  ప్రస్తుతం మీరు డ్రాఫ్ట్ కంటెంట్‌ను సేవ్ చేయలేదు"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"కోర్సులు","ACTIVITY_TEXTBOOK_TITLE":"కోర్సులు","chapter":"కోర్సు మాడ్యూల్","desktop":{"downloadBook":"కోర్సును డౌన్‌లోడ్ చేయండి","find_more":"మరిన్ని కోర్సులు మరియు సంబంధిత కంటెంట్‌ను కనుగొనండి{instance}","updateTextbook":"కోర్సును నవీకరించండి"},"downloadBooks":"ఆఫ్‌లైన్‌లో ఉన్నప్పుడు ప్రాప్యత చేయడానికి కోర్సులను డౌన్‌లోడ్ చేయండి","fromTheTextBook":"కోర్సు నుండి","noBookfoundTitle":"బోర్డు కోర్సులను జోడిస్తోంది","textbooks":"కోర్సులు"}}},"trk":{"completedCourse":"కోర్సు ముగిసింది","frmelmnts":{"btn":{"createCourse":"కోర్సును సృష్టించండి","enroll":"నమోదుచేయి","resumecourse":"కోర్సు కొనసాగించండి","unenroll":"శిక్షణను వదిలివేయండి","viewcoursestats":"కోర్సు గణాంకాలను వీక్షించండి","viewCourseStatsDashboard":"శిక్షణ డాష్‌బోర్డ్‌ను చూడండి"},"instn":{"t0062":"మీరు ఇంకా ఈ కోర్సు కోసం బ్యాచ్ని సృష్టించలేదు. క్రొత్త బ్యాచ్ని సృష్టించండి మరియు మళ్లీ డాష్బోర్డ్ను తనిఖీ చేయండి.","t0063":"మీరు ఇంకా ఏ కోర్సును సృష్టించలేదు. క్రొత్త కోర్సు సృష్టించి, మళ్ళీ డాష్బోర్డ్ను తనిఖీ చేయండి."},"lbl":{"accessCourse":"యాక్సెస్ కోర్సు","accessToLogin":"కోర్సు ప్లేయర్‌ను ఆక్సెస్ చెయ్యడానికి మీరు లాగిన్ అయి చేరాలి","ActivityCourses":"కోర్సులు","ACTIVITY_COURSE_TITLE":"కోర్సులు","addCourse":"కోర్సును జోడించండి.","completedCourse":"కోర్సు ముగిసింది","completingCourseSuccessfully":"శిక్షణను విజయవంతంగా పూర్తి చేసినందుకు","copyAsCourse":"కోర్సుగా కాపీ చేయండి","courseContainCertificate":"ఈ కోర్సులో సర్టిఫికేట్ ఉంది","courseDetails":"కోర్సు వివరాలు","courseDontContainCertificate":"ప్రస్తుతం, ఈ కోర్సుకు సర్టిఫికేట్ లేదు. కోర్సు సృష్టికర్త తరువాత ప్రమాణపత్రాన్ని అటాచ్ చేయవచ్చు.","courseLastUpdatedOn":"కోర్సు చివరిగా నవీకరించబడింది","courseProgress":"కోర్సు పురోగతి","courseRelevantFor":"కోర్సు సంబంధించినది","courses":"కోర్సులు","coursestructure":"కోర్సు నిర్మాణం","courseSuccessMessage":"మీరు కోర్సును విజయవంతంగా పూర్తి చేసారు","courseSuccessNotificationMessage":"7 రోజుల్లోపు మీ రిజిస్టర్డ్ సంప్రదింపు వివరాలపై కోర్సు సర్టిఫికేట్ గురించి మీకు తెలియజేయబడుతుంది","courseWithoutCertificateNote":"గమనిక: ఈ కోర్సుకు సర్టిఫికేట్ లేదు","dashboardnocourseselected":"ఏ కోర్సు ఎంచుకోలేదు!","dashboardnocourseselecteddesc":"దయచేసి పైన జాబితా నుండి ఒక కోర్సు ఎంచుకోండి","downloadCourseQRCode":"శిక్షణ QR కోడ్‌ను డౌన్‌లోడ్ చేయండి","downloadQRCode":{"tooltip":"QR కోడ్‌లను డౌన్‌లోడ్ చేయడానికి క్లిక్ చేసి, వాటిని ప్రచురించిన శిక్షణకు లింక్ చేయండి"},"enrollcourse":"కోర్సు నమోదు చేయండి","getUnlimitedAccess":"మీ మొబైల్ ఫోన్‌లో పాఠ్యపుస్తకాలు, పాఠాలు మరియు శిక్షణలకు ఆఫ్‌లైన్‌లో అపరిమిత ప్రాప్యతను పొందండి.","joinTrainingToAcessContent":"కంటెంట్‌కు పూర్తి ప్రాప్యత పొందడానికి మీరు తప్పనిసరిగా కోర్సులో చేరాలి","moduleFinish":"మీరు ఈ మాడ్యూల్ పూర్తి చేసారు","moduleProgress":"మాడ్యూల్ పురోగతి","mytrainings":"నా శిక్షణలు","nextModule":"తదుపరి మాడ్యూల్","oneCourse":"కోర్సు","prevModule":"మునుపటి.  మాడ్యూల్","returnToCourses":"శిక్షణలకు తిరిగి వెళ్ళు","sectionTitle":"కోర్సులు","selectChapter":"మాడ్యూల్ ఎంచుకోండి","selectContentFromCourse":"కోర్సు కోసం విషయాలను ఎంచుకోండి","signinenrollTitle":"ఈ కోర్సు కోసం నమోదు చేయడానికి సైన్ ఇన్ చేయండి:","trainingAttended":"శిక్షణలు హాజరయ్యాయి","userName":"వినియోగదారు పేరు"},"tab":{"courses":"కోర్సులు"}},"messages":{"dashboard":{"emsg":{"m002":"ఈ కోర్సు యొక్క ఏ బ్యాచ్‌లలోనూ వినియోగదారు నమోదు చేయబడలేదు"}},"emsg":{"m0002":"కోర్సు ఇక లేదు","m0003":"ఈ కోర్సులో ఓపెన్ బ్యాచ్‌లు లేవు"},"fmsg":{"m0001":"పొందుపర్చిన కోర్సులు విఫలమయ్యాయి, దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి","m0002":"ఇతర కోర్సులు పొందడంలో విఫలమైంది, దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి ...","m0082":"నమోదు కోసం ఈ కోర్సు తెరవబడలేదు","m0086":"ఈ కోర్సు రచయితచే రిటైర్ చేయబడింది, అందుకే ఇక అందుబాటులో లేదు."},"imsg":{"m0001":"ఈ కోర్సు తగనిదిగా ఫ్లాగ్ చేయబడింది మరియు ప్రస్తుతం సమీక్షలో ఉంది. దయచేసి తర్వాత మళ్లీ తనిఖీ చేయండి.","m0026":"హాయ్, ఈ కోర్సు ఇప్పుడు అందుబాటులో లేదు. ఇది సృష్టికర్త కొన్ని మార్పులను కోర్సులో చేసింది."},"stmsg":{"m0125":"రిసోర్స్, బుక్, కోర్సు, కలెక్షన్ లేదా అప్లోడ్ సృష్టించడం ప్రారంభించండి. ప్రస్తుతానికి మీ వద్ద పని-లో-పురోగతి డ్రాఫ్ట్ లేదు"}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"పాఠ్య పుస్తకాలు","ACTIVITY_TEXTBOOK_TITLE":"పాఠ్యపుస్తకాలు","chapter":"అధ్యాయం","copyAsCourse":"కోర్సుగా కాపీ చేయండి","desktop":{"deleteCollection":"{Name} పాఠ్యపుస్తకాన్ని తొలగించడం నా డౌన్‌లోడ్‌ల నుండి తీసివేస్తుంది.  కొనసాగించడానికి తొలగించు క్లిక్ చేయండి.","downloadBook":"పాఠ్యపుస్తకాన్ని డౌన్‌లోడ్ చేయండి","find_more":"మరిన్ని పాఠ్యపుస్తకాలు మరియు కంటెంట్‌ను {instance}లో కనుగొనండి","updateTextbook":"పాఠ్యపుస్తకాన్ని నవీకరించండి"},"dialCodeDescription":"QR కోడ్ మీ టెక్స్ట్ బుక్‌లోని QR కోడ్ ఇమేజ్ క్రింద కనిపించే 6 అంకెల ఆల్ఫాన్యూమరిక్ కోడ్","dialCodeDescriptionGetPage":"QR కోడ్ మీ టెక్స్ట్ బుక్‌లోని QR కోడ్ ఇమేజ్ క్రింద కనిపించే 6 అంకెల ఆల్ఫాన్యూమరిక్ కోడ్.","downloadBooks":"ఆఫ్‌లైన్‌లో ఉన్నప్పుడు ప్రాప్యత చేయడానికి పుస్తకాలను డౌన్‌లోడ్ చేయండి","fromTheTextBook":"పాఠ్య పుస్తకం నుండి","getUnlimitedAccess":"మీ మొబైల్ ఫోన్‌లో పాఠ్యపుస్తకాలు, పాఠాలు మరియు కోర్సులకు ఆఫ్‌లైన్‌లో అపరిమిత ప్రాప్యతను పొందండి","import":"ఆఫ్‌లైన్‌లో ఉన్నప్పుడు ప్రాప్యత చేయడానికి పుస్తకాలను డౌన్‌లోడ్ చేయండి","installAppDesc":"పాఠాలు, పాఠ్యపుస్తకాలు మరియు కంటెంట్‌ను ఆఫ్‌లైన్‌లో మీ పరికరంలో నిల్వ చేయండి","mynotebook":"నా నోట్బుక్","noBookfoundButtonText":"మరిన్ని పుస్తకాలు మరియు విషయాలను చూడండి","noBookfoundSubTitle":"మీ బోర్డు ఇంకా ఎక్కువ పుస్తకాలను జోడించలేదు. మరిన్ని పుస్తకాలు మరియు కంటెంట్ చూడటానికి {instance} బటన్ నొక్కండి","noBookfoundTitle":"బోర్డు పుస్తకాలను జోడిస్తోంది","textbooks":"పాఠ్యపుస్తకాలు"}},"messages":{"stmsg":{"m0125":"వనరు, పుస్తకం, కోర్సు, సేకరణ లేదా అప్‌లోడ్ సృష్టించడం ప్రారంభించండి.  ప్రస్తుతానికి మీకు పనిలో పురోగతి డ్రాఫ్ట్ లేదు"}}},"trk":{"frmelmnts":{"btn":{"enroll":"చదవండి","resumecourse":"పఠనాన్ని తిరిగి ప్రారంభించండి","unenroll":"ముగింపు"},"instn":{"t0062":"ఈ పాఠ్య పుస్తకం కోసం మీరు ఇంకా ఎటువంటి అభ్యాస / పఠన బ్యాచ్‌ను సృష్టించలేదు.  ఒక బ్యాచ్‌ను సృష్టించండి మరియు డాష్‌బోర్డ్‌ను తనిఖీ చేయండి","t0063":"మీరు ఇంకా ఏ పాఠ్యపుస్తకాన్ని సృష్టించలేదు.  పాఠ్యపుస్తకాన్ని సృష్టించండి మరియు డాష్‌బోర్డ్‌ను తనిఖీ చేయండి"},"lbl":{"accessCourse":"పాఠ్యపుస్తకాన్ని యాక్సెస్ చేయండి","accessToLogin":"పాఠ్యపుస్తకాన్ని ఆక్సెస్ చెయ్యడానికి మీరు లాగిన్ అయి లెర్నింగ్ / రీడింగ్ బ్యాచ్‌లో చేరాలి","ActivityCourses":"పాఠ్య పుస్తకం","ACTIVITY_COURSE_TITLE":"పాఠ్య పుస్తకం","addCourse":"పాఠ్యపుస్తకాన్ని జోడించండి","completedCourse":"పాఠ్యపుస్తకాలు పూర్తయ్యాయి","completingCourseSuccessfully":"నేర్చుకోవడం విజయవంతంగా పూర్తి చేసినందుకు","copyAsCourse":"పాఠ్యపుస్తకంగా కాపీ చేయండి","courseDetails":"పాఠ్యపుస్తక వివరాలు","courses":"పాఠ్యపుస్తకాలు","coursestructure":"అధ్యాయం","joinTrainingToAcessContent":"కంటెంట్‌ను యాక్సెస్ చేయడానికి, మీరు లెర్నింగ్ బ్యాచ్‌లో చేరాలి","moduleFinish":"మీరు ఈ అధ్యాయాన్ని పూర్తి చేసారు","moduleProgress":"అధ్యాయం పురోగతి","mytrainings":"నా డిజిటల్ పాఠ్యపుస్తకాలు","nextModule":"తదుపరి అధ్యాయం","oneCourse":"డిజిటల్ పాఠ్య పుస్తకం","prevModule":"మునుపటి.  అధ్యాయం","sectionTitle":"డిజిటల్ పాఠ్యపుస్తకాలు","selectChapter":"అధ్యాయాన్ని ఎంచుకోండి","trainingAttended":"పాఠ్యపుస్తకాలు చదివారు","courseContainCertificate":"ప్రస్తుతం, ఈ అభ్యాస పనికి సర్టిఫికేట్ లేదు.  విధి సృష్టికర్త తరువాత ప్రమాణపత్రాన్ని అటాచ్ చేయవచ్చు.","courseDontContainCertificate":"ప్రస్తుతం, ఈ అభ్యాస పనికి సర్టిఫికేట్ లేదు.  విధి సృష్టికర్త తరువాత ప్రమాణపత్రాన్ని అటాచ్ చేయవచ్చు."},"tab":{"courses":"డిజిటల్ పాఠ్య పుస్తకం"}},"messages":{"emsg":{"m0002":"ఈ పాఠ్య పుస్తకం ఇకపై అందుబాటులో లేదు"},"fmsg":{"dataSettingNotSubmitted":"ప్రొఫైల్ వాటా సెట్టింగ్‌లను నవీకరించడం సాధ్యం కాలేదు.  తరువాత మళ్ళీ ప్రయత్నించండి","m0001":"క్షమించండి!  మీరు వెతుకుతున్న పాఠ్యపుస్తకాన్ని మేము పొందలేకపోయాము.  తరువాత మళ్ళీ ప్రయత్నించండి","m0002":"క్షమించండి!  మేము మీ కోసం ఇతర పాఠ్యపుస్తకాలను పొందలేకపోయాము.  తరువాత మళ్ళీ ప్రయత్నించండి","m0086":"ఈ పాఠ్య పుస్తకం ఇప్పుడు అందుబాటులో లేదు"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"టీవీ క్లాసులు","ACTIVITY_TEXTBOOK_TITLE":"టీవీ క్లాసులు","ACTIVITY_TV_CLASS_TITLE":"టీవీ క్లాసులు","chapter":"టీవీ కార్యక్రమం","collection_tv_classes":"టీవీ క్లాసులు","desktop":{"downloadBook":"టీవీ తరగతులను డౌన్‌లోడ్ చేయండి","downloadTVclasses":"టీవీ తరగతులను డౌన్‌లోడ్ చేయండి","find_more":"మరిన్ని టీవీ తరగతులు మరియు సంబంధిత కంటెంట్‌ను {instance}లో కనుగొనండి","find_more_TVclasses":"మరిన్ని టీవీ తరగతులు మరియు సంబంధిత కంటెంట్‌ను కనుగొనండి{instance}","updateTextbook":"టీవీ తరగతులను నవీకరించండి","updateTVclasses":"టీవీ తరగతులను నవీకరించండి"},"downloadBooks":"ఆఫ్‌లైన్‌లో ఉన్నప్పుడు యాక్సెస్ చేయడానికి టీవీ క్లాస్‌లను డౌన్‌లోడ్ చేయండి","downloadTVclasses":"ఆఫ్‌లైన్‌లో ఉన్నప్పుడు యాక్సెస్ చేయడానికి టీవీ క్లాస్‌లను డౌన్‌లోడ్ చేయండి","fromTheTextBook":"టీవీ క్లాస్ నుండి","fromTheTVclasses":"టీవీ క్లాస్ నుండి","noBookfoundTitle":"బోర్డు టీవీ క్లాస్‌ని జతచేస్తోంది","textbooks":"టీవీ క్లాసులు","TVclassesfoundTitle":"బోర్డు టీవీ క్లాస్‌ని జతచేస్తోంది","tv_classes":"టీవీ క్లాసులు","tv_program":"టీవీ కార్యక్రమం"}}},"trk":{"frmelmnts":{"btn":{"enroll":"చూడండి","resumecourse":"చూడటం పునః ప్రారంభించండి"},"instn":{"t0062":"మీరు ఇంకా ఈ టీవీ క్లాస్ కోసం ఎటువంటి లెర్నింగ్ బ్యాచ్‌ను సృష్టించలేదు.  ఒక బ్యాచ్‌ను సృష్టించండి మరియు డాష్‌బోర్డ్‌ను తనిఖీ చేయండి","t0063":"మీరు ఇంకా ఏ టీవీ క్లాస్‌ని సృష్టించలేదు.  టీవీ క్లాస్‌ని సృష్టించండి మరియు డాష్‌బోర్డ్‌ను తనిఖీ చేయండి"},"lbl":{"accessCourse":"టీవీ తరగతులను యాక్సెస్ చేయండి","accessToLogin":"టీవీ తరగతిని ఆక్సెస్ చెయ్యడానికి మీరు లాగిన్ అయి లెర్నింగ్ బ్యాచ్‌లో చేరాలి","ActivityCourses":"టీవీ క్లాసులు","ACTIVITY_COURSE_TITLE":"టీవీ క్లాసులు","addCourse":"టీవీ క్లాస్‌ని జోడించండి","completedCourse":"టీవీ తరగతులు పూర్తి చేశారు","copyAsCourse":"టీవీ క్లాస్‌గా కాపీ చేయండి","courseContainCertificate":"ఈ అభ్యాసం మీకు ధృవీకరణ పత్రాన్ని అందిస్తుంది","courseDetails":"టీవీ క్లాస్ వివరాలు","courses":"టీవీ క్లాసులు","coursestructure":"టీవీ కార్యక్రమం","moduleFinish":"మీరు ఈ కార్యక్రమాన్ని పూర్తి చేసారు","moduleProgress":"ప్రోగ్రామ్ పురోగతి","mytrainings":"నా టీవీ క్లాసులు","nextModule":"తదుపరి ప్రోగ్రామ్","oneCourse":"టీవీ క్లాస్","prevModule":"మునుపటి.  ప్రోగ్రామ్","sectionTitle":"టీవీ క్లాసులు","selectChapter":"ప్రోగ్రామ్‌ను ఎంచుకోండి","trainingAttended":"టీవీ క్లాసులు చూశారు","courseDontContainCertificate":"ప్రస్తుతం, ఈ అభ్యాస పనికి సర్టిఫికేట్ లేదు.  విధి సృష్టికర్త తరువాత ప్రమాణపత్రాన్ని అటాచ్ చేయవచ్చు"},"tab":{"courses":"టీవీ క్లాసులు"}},"messages":{"emsg":{"m0002":"ఈ టీవీ క్లాస్ టాస్క్ ఇప్పుడు అందుబాటులో లేదు"},"fmsg":{"m0001":"క్షమించండి!  మీరు వెతుకుతున్న టీవీ తరగతులను మేము పొందలేకపోయాము.  తరువాత మళ్ళీ ప్రయత్నించండి","m0002":"క్షమించండి!  మేము మీ కోసం ఇతర టీవీ తరగతులను పొందలేకపోయాము.  తరువాత మళ్ళీ ప్రయత్నించండి","m0086":"ఈ టీవీ క్లాస్ ఇప్పుడు అందుబాటులో లేదు"}}}}}
\ No newline at end of file
diff --git a/utils/portal/labels/all_labels_ur.json b/utils/portal/labels/all_labels_ur.json
new file mode 100644
index 000000000..8b1eca097
--- /dev/null
+++ b/utils/portal/labels/all_labels_ur.json
@@ -0,0 +1 @@
+{"dflt":{"nontrk":{"frmelmnts":{"btn":{"create":"بنائیں"},"lbl":{"ActivityTextbooks":"کام","ACTIVITY_TEXTBOOK_TITLE":"ٹاسکس","chapter":"سیکھنےکاماڈیول","collection_task":"ٹاسکس","desktop":{"download":"ڈاؤن لوڈ","downloadBook":"ڈاؤن لوڈ","find_more":"مزید مواد تلاش کریں","find_more_tasks":"مزید مشمولات تلاش کریں","update":"اپ ڈیٹ","updateTextbook":"اپ ڈیٹ"},"downloadBooks":"آف لائن تک رسائی کے لئے ڈاؤن لوڈ کریں","downloadoffline":"آف لائن تک رسائی کے لئے ڈاؤن لوڈ کریں","download_to_access_offline":"آف لائن تک رسائی کے لئے ڈاؤن لوڈ کریں","fromTheLearningTask":"سیکھنے کے کام سے","fromTheTextBook":"سیکھنے کے کام سے","import":"آف لائن تک رسائی کے  لئے ڈاؤن لوڈ کریں","learningmodule":"سیکھنے کا ماڈیول","mynotebook":"میری نوٹ بک","noBookfoundButtonText":"مزید دیکھیں","noBookfoundSubTitle":"آپ کے بورڈ میں مواد شامل ہونی باقی ہے۔ مزید مشمولات دیکھنے کیلئے ‪{instance}‬ بٹن کو ٹیپ کریں","noBookfoundTitle":"بورڈ مواد شامل کررہا ہے","noTaskfoundSubTitle":"آپ کے بورڈ میں ابھی تک مواد شامل نہیں ہے۔ مزید مشمولات دیکھنے کیلئے ‪{instance}‬ بٹن کوٹیپ کریں","noTaskfoundTitle":"بورڈ مواد شامل کررہا ہے","seemore":"دیکھیں مزید","task":"ٹاسکس","tasks":"کام","task_title":"ٹاسکس","textbooks":"کام"}},"messages":{"stmsg":{"m0125":"مواد بنانا یا اپ لوڈ کرنا شروع کریں۔ اس وقت آپ کے پاس کوئی مواد ڈرافٹ کے بطور محفوظ نہیں ہے","ms0001":"مواد بنانا یا اپ لوڈ کرنا شروع کریں۔ اس وقت آپ کے پاس کوئی مواد ڈرافٹ کے بطور محفوظ نہیں ہے"}}},"trk":{"completed_learning":"سیکھنا مکمل ہوا","essages":{"fmsg":{"m0082":"سیکھنے کا یہ کام ابھی تک کھلا نہیں ہے۔ آپ اس میں شامل نہیں ہو سکتے"}},"frmelmnts":{"btn":{"create":"بنانا","enroll":"شامل ہوں","resumecourse":"جاری رکھیں","unenroll":"چھوڑ دو","viewcoursestats":"اعدادوشمار دیکھیں","viewCourseStatsDashboard":"ڈیش بورڈ دیکھیں"},"instn":{"t0062":"آپ نے ابھی تک اس کام کے لئے کوئی بیچ تشکیل نہیں دیا ہے۔ ایک کام بنائیں اور ڈیش بورڈ چیک کریں","t0063":"آپ نے ابھی تک کوئی کام تخلیق نہیں کیا ہے۔ نیا کام بنائیں اور ڈیش بورڈ کو دوبارہ چیک کریں۔"},"lbl":{"accessCourse":"مواد سیکھنے  کیلئے رسائی حاصل کریں","accessToLogin":"مواد تک رسائی حاصل کرنے کے لئے آپ کو لاگ ان کر اس کام میں شامل ہونا ہوگا","ActivityCourses":"ٹاسکس","ACTIVITY_COURSE_TITLE":"ٹاسکس","addCourse":"شامل کریں","completedCourse":"مکمل ٹاسکس","completingCourseSuccessfully":"کامیابی سے مکمل سیکھنے کیلئے ،","copyAsCourse":"سیکھنے کے مواد کے طور پر کاپی کریں","courseContainCertificate":"یہ تعلیم آپ کو ایک سرٹیفیکیٹ پیش کرتی ہے","courseDetails":"سیکھنے کی تفصیلات","courseProgress":"ترقی","courseRelevantFor":"یہ سیکھنے کے لئے متعلقہ ہے:","courses":"ٹاسکس","coursestructure":"سیکھنےکاماڈیول","courseSuccessMessage":"آپ نے اپنی تعلیم کامیابی کے ساتھ مکمل کرلی ہے","courseSuccessNotificationMessage":"آپ کو 7 دن کے اندر اپنے رجسٹرڈ رابطے کی تفصیلات پر اپنے سرٹیفکیٹ کے بارے میں بتایا جائے گا","courseWithoutCertificateNote":"نوٹ: یہ لرننگ آپ کو سرٹیفکیٹ پیش نہیں کرتی ہے","dashboardnocourseselected":"کوئی انتخاب نہیں ہوا","dashboardnocourseselecteddesc":"فہرست میں سے منتخب کریں","downloadCourseQRCode":"QR کوڈ ڈاؤن لوڈ کریں","downloadQRCode":{"tooltip":"‪QR‬کوڈز کو ڈاؤن لوڈ کرنے کے لئے کلک کریں اور انہیں اپنی اشاعت سے جوڑیں"},"getUnlimitedAccess":"اپنے موبائل فون پر درسی کتب ، ٹی وی کلاس اور کورس آف لائن تک لامحدود رسائی حاصل کریں","joinTrainingToAcessContent":"مواد تک رسائی حاصل کرنے کے لئے ، آپ کو لاگ ان کرکے اس کام میں شامل ہونا ہوگا","moduleFinish":"آپ نے یہ کام مکمل کرلیا ہے","moduleProgress":"کام کی پیش رفت","mytrainings":"میرے کام","nextModule":"اگلا کام","oneCourse":"ٹاسک","prevModule":"پچھلا کام","returnToCourses":"پیچھے","sectionTitle":"کام","selectChapter":"کام منتخب کریں","selectContentFromCourse":"مشمولات منتخب کریں","trainingAttended":"تعلیم میں شرکت","courseDontContainCertificate":"فی الحال ، اس سیکھنے کے کام میں سرٹیفیکیٹ نہیں ہے۔ ٹاسک تخلیق کار بعد میں ایک سرٹیفیکیٹ منسلک کرسکتا ہے"},"tab":{"courses":"ٹاسکس"}},"messages":{"dashboard":{"emsg":{"m002":"صارف نے اس سیکھنے کے کام کے لئے کسی بھی بیچ میں شامل نہیں ہوا ہے"}},"emsg":{"m0002":"سیکھنے کا یہ کام اب دستیاب نہیں ہے","m0003":"اس سیکھنے کے کام میں کھلا بیچ نہیں ہے"},"fmsg":{"dataSettingNotSubmitted":"پروفائل شیئر کی ترتیبات کو اپ ڈیٹ نہیں کیا جاسکا۔ بعد میں دوبارہ کوشش کریں","m0001":"معذرت! ہم آپ کے لئے درج کردہ سیکھنے کے کام کے لئے معلومات حاصل نہیں کر سکتے ہیں. بعد میں دوبارہ کوشش کریں","m0002":"معذرت! ہم آپ کے لئے  دوسرے سیکھنے کے کاموں کو نہیں لا سکے۔ بعد میں دوبارہ کوشش کریں","m0086":"یہ مواد اب دستیاب نہیں ہے"},"imsg":{"m0001":"اس مشمول کو نامناسب قرار دیا گیا ہے۔ فی الحال یہ زیر جائزہ ہے","m0026":"ہیلو ، یہ مواد اس وقت دستیاب نہیں ہے۔ اس میں تبدیلی ہوسکتی ہے"},"stmsg":{"m0125":"مواد بنانا یا اپ لوڈ کرنا شروع کریں۔ فی الحال آپ نے کوئی مسودہ مواد کو محفوظ نہیں کیا ہے"}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"کورسز","ACTIVITY_TEXTBOOK_TITLE":"کورسز","chapter":"کورس ماڈیول","desktop":{"downloadBook":"کورس ڈاؤن لوڈ کریں","find_more":"مزید کورسز اور متعلقہ مواد ‪{instance}‬ پر تلاش کریں","updateTextbook":"کورس کو اپ ڈیٹ کریں"},"downloadBooks":"آف لائن رہتے ہوئے رسائی کے لئے کورسز ڈاؤن لوڈ کریں","fromTheTextBook":"کورس سے","noBookfoundTitle":"بورڈ کورسز کا شامل کر رہا ہے","textbooks":"کورسز"}}},"trk":{"completedCourse":"کورس مکمل ہو گیا ہے","frmelmnts":{"btn":{"createCourse":"کورس بنائیں","enroll":"کورس میں داخلہ لیں","resumecourse":"کورس دوبارہ شروع کریں","unenroll":"کورس چھوڑیں","viewcoursestats":"کورس کے اعداد و شمار دیکھیں","viewCourseStatsDashboard":"کورس ڈیش بورڈ دیکھیں"},"instn":{"t0062":"اس کورس  کے لئے آپ نے ابھی تک  بیچ نہیں بنایا ہے۔ نیا بیچ بنائیں اور ڈیش بورڈ دوبارہ چیک کریں۔","t0063":"آپ نے ابھی تک کوئی کورس نہیں بنای ہے۔ نئ کورس بنائیں اور ڈیش بورڈ دوبارہ چیک کریں۔"},"lbl":{"accessCourse":"رسائی کورس","accessToLogin":"کورس تک رسائی حاصل کرنے کے لئے, آپ کو لاگ ان کر کورس میں شامل ہونا پڑے گا","ActivityCourses":"کورسز","ACTIVITY_COURSE_TITLE":"کورسز","addCourse":"کورس شامل کریں","completedCourse":"مکمل کورسز","completingCourseSuccessfully":"کورس کامیابی کے ساتھ مکمل کرنے کیلئے ،","copyAsCourse":"بطور کورس نقل کریں","courseContainCertificate":"یہ ایک سرٹیفکیٹ کورس ہے","courseDetails":"کورس کی تفصیلات","courseDontContainCertificate":"فی الحال ، اس کورس کے پاس سرٹیفیکیٹ نہیں ہے۔ کورس تخلیق کار بعد میں ایک سرٹیفیکیٹ منسلک کرسکتا ہے","courseLastUpdatedOn":"کورس آخری بار اپ ڈیٹ ہوا","courseProgress":"کورس کی ترقی","courseRelevantFor":"کورس کے لئے متعلقہ ہے:","courses":"کورسز","coursestructure":"کورس ماڈیول","courseSuccessMessage":"آپ نے کامیابی کے ساتھ کورس مکمل کیا ہے","courseSuccessNotificationMessage":"رابطے کیلئے دی گئی تفصیلات پر آپ کو 7 دن کے اندر کورس کے سرٹیفکیٹ کے بارے میں مطلع کیا جائے گا","courseWithoutCertificateNote":"نوٹ: اس کورس میں سرٹیفکیٹ نہیں ہے","dashboardnocourseselected":"کوئی کورس منتخب نہیں","dashboardnocourseselecteddesc":"مندرجہ بالا فہرست سے کورس منتخب کریں.","downloadCourseQRCode":"کورس کا QR کوڈ ڈاؤن لوڈ کریں","downloadQRCode":{"tooltip":"QR  کوڈز کو ڈاؤن لوڈ کرنے کے لئے کلک کریں اور انہیں شائع کورس سے لنک کریں"},"enrollcourse":"کورس میں داخلہ لیں","getUnlimitedAccess":"اپنے موبائل فون پر آف لائن درسی کتابیں، سبق اور کورسز کی لامحدود رسائی حاصل کریں.","joinTrainingToAcessContent":"مواد تک مکمل رسائی حاصل کرنے آپ کو کورس میں شامل ہونا پڑے گا","moduleFinish":"آپ نے یہ ماڈیول مکمل کرلیا ہے","moduleProgress":"ماڈیول پیش رفت","mytrainings":"میرے کورسز","nextModule":"اگلا ماڈیول","oneCourse":"کورس","prevModule":"پچھلا ماڈیول","returnToCourses":"کورسز پر واپس جائیں","sectionTitle":"کورسز","selectChapter":"ماڈیول منتخب کریں","selectContentFromCourse":"کورس کے لئے مواد منتخب کریں","signinenrollTitle":"اس کورس میں داخلے  کے لئےلاگ ان کریں.","trainingAttended":"کورسز میں شرکت","userName":"صارف نام"},"tab":{"courses":"کورسز"}},"messages":{"dashboard":{"emsg":{"m002":"صارف اس کورس کے کسی بھی بیچ میں درج نہیں ہے"}},"emsg":{"m0002":"کورس اب دستیاب نہیں ہے","m0003":"اس کورس میں کوئی کھلا بیچز نہیں ہے"},"fmsg":{"m0001":"اندراج نصاب کو حاصل کرنے میں  ناکامی ہوئ، بعد میں دوبارہ کوشش کریں","m0002":"دیگر نصاب  حاصل کرنے میں ناکامی ہوئ، بعد میں دوبارہ کوشش کریں۔۔۔","m0082":"یہ کورس اندراج کے لئے کھلا نہیں ہے","m0086":"یہ کورس مصنف کی طرف سے ریٹائرکردیا گیا ہے اور اس وجہ سے اب دستیاب نہیں ہے."},"imsg":{"m0001":"یہ کورس نامناسب طور پر نشان دہ کی گئ ہے اور فی الحال جائزے کے تحت ہے۔","m0026":"ہیلو، یہ کورس اب دستیاب نہیں ہے۔ یہ ممکن ہے کہ خالق نے کورس  میں کچھ تبدیلیاں کی ہوں."},"stmsg":{"m0125":"وسائل، کتاب، کورس، مجموعہ یا اپ لوڈ بنانے شروع کریں. آپ اس وقت کوئی کام میں پیش رفت کا مسودہ نہیں رکھتے ہیں"}}}},"tbk":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":"درسی کتابیں","ACTIVITY_TEXTBOOK_TITLE":"درسی کتابیں","chapter":"باب","copyAsCourse":"کورس کے طور پر کاپی کریں","desktop":{"deleteCollection":"درسی کتاب {name} کو مٹانے سے یہ میرے ڈاؤن لوڈز سے ہٹ جاتا ہے۔ جاری رکھنے کے لئے 'مٹا دیں' پر کلک کریں۔","downloadBook":"درسی کتاب ڈاؤن لوڈ کریں","find_more":"{instance}  پر مزید درسی کتابیں اور مواد تلاش کریں","updateTextbook":"نصابی کتاب اپ ​​ڈیٹ کریں"},"dialCodeDescription":"ڈائل کوڈ آپ کے درسی کتاب میں QR کوڈ کے تحت پایا گیا 6 عددی حروف تہجی کوڈ ہے","dialCodeDescriptionGetPage":"QR کوڈ آپ کے ٹیکسٹ بک میں QR کوڈ کی تصویر کے نیچے پایا گیا 6 عددی حروف تہجی کوڈ ہے.","downloadBooks":"آف لائن کتابوں تک رسائی حاصل کرنے کے لئے انھیں ڈاؤن لوڈ کریں","fromTheTextBook":"درسی کتاب سے","getUnlimitedAccess":"اپنے موبائل فون پر آف لائن درسی کتابیں، سبق اور کورسز کی لامحدود رسائی حاصل کریں.","import":"آف لائن تک رسائی کے لیے کتابیں ڈاؤن لوڈ کریں","installAppDesc":"اپنے آلہ پر سبق ، درسی کتابیں اور مواد آف لائن اسٹور کریں","mynotebook":"میری نوٹ بک","noBookfoundButtonText":"مزید کتابیں اور مواد دیکھیں","noBookfoundSubTitle":"آپ کے بورڈ میں مزید کتابیں شامل ہونی باقی ہے۔ مزید کتابیں اور مواد کو {instance} پر دیکھنے کے لئے بٹن کوٹیپ کریں","noBookfoundTitle":"بورڈ کتابیں شامل کررہا ہے","textbooks":"درسی کتابیں"}},"messages":{"stmsg":{"m0125":"وسائل، کتاب، کورس، مجموعہ یا اپ لوڈ بنانے شروع کریں. آپ اس وقت کوئی کام میں پیش رفت کا مسودہ نہیں رکھتے ہیں"}}},"trk":{"frmelmnts":{"btn":{"enroll":"پڑھیں","resumecourse":"دوبارہ پڑھنا شروع کریں","unenroll":"بند"},"instn":{"t0062":"آپ نے ابھی تک اس درسی کتاب کے لئے کوئی سیکھنے / پڑھنے والا بیچ نہیں بنایا ہے۔ ایک بیچ بنائیں اور ڈیش بورڈ چیک کریں","t0063":"آپ نے ابھی تک کوئی درسی کتاب نہیں بنائی ہے۔ ایک درسی کتاب بنائیں اور ڈیش بورڈ چیک کریں"},"lbl":{"accessCourse":"درسی کتاب تک رسائی","accessToLogin":"درسی کتاب تک رسائی حاصل کرنے کے  لئے آپ کو لاگ ان کرنا ہوگا اور سیکھنے / پڑھنے والے بیچ میں شامل ہونا ہوگا","ActivityCourses":"درسی کتاب","ACTIVITY_COURSE_TITLE":"درسی کتاب","addCourse":"درسی کتاب شامل کریں","completedCourse":"مکمل درسی کتابیں","completingCourseSuccessfully":"کامیابی کے ساتھ سیکھنے کو مکمل کرنے کے لئے،","copyAsCourse":"بطور درسی کتاب نقل کریں","courseDetails":"درسی کتاب کی تفصیلات","courses":"درسی کتابیں","coursestructure":"باب","joinTrainingToAcessContent":"مواد تک رسائی حاصل کرنے کے لئے ، آپ کو سیکھنے والے بیچ میں شامل ہونا چاہئے","moduleFinish":"آپ نے یہ باب مکمل کرلیا ہے","moduleProgress":"باب کی پیش رفت","mytrainings":"میری ڈیجیٹل درسی کتابیں","nextModule":"اگلا باب","oneCourse":"ڈیجیٹل درسی کتاب","prevModule":"پچھلا باب","sectionTitle":"ڈیجیٹل درسی کتابیں","selectChapter":"باب منتخب کریں","trainingAttended":"درسی کتابیں پڑھیں","courseContainCertificate":"یہ  تعلیم آپ کو ایک سرٹیفکیٹ فراہم کرتا ہے","courseDontContainCertificate":"فی الحال ، اس سیکھنے کے کام کے پاس سرٹیفیکیٹ نہیں ہے۔ ٹاسک تخلیق کار بعد میں ایک سرٹیفیکیٹ منسلک کرسکتا ہے"},"tab":{"courses":"ڈیجیٹل درسی کتاب"}},"messages":{"emsg":{"m0002":"یہ درسی کتاب اب دستیاب نہیں ہے"},"fmsg":{"dataSettingNotSubmitted":"پروفائل حصہ داری کی ترتیبات کو اپ ڈیٹ نہیں کیا جاسکا۔ بعد میں دوبارہ کوشش کریں","m0001":"معذرت! ہمیں درسی کتاب نہیں مل سکی جس کی آپ تلاش کر رہے تھے۔ بعد میں دوبارہ کوشش کریں","m0002":"معذرت! ہم آپ کے لئے دوسری درسی کتابیں نہیں لا سکے۔ بعد میں دوبارہ کوشش کریں","m0086":"یہ درسی کتاب اب دستیاب نہیں ہے"}}}},"tvc":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTvClasses":"ٹی وی کلاسز","ACTIVITY_TEXTBOOK_TITLE":"ٹی وی کلاسز","ACTIVITY_TV_CLASS_TITLE":"ٹی وی کلاسز","chapter":"ٹی وی پروگرام","collection_tv_classes":"ٹی وی کلاسز","desktop":{"downloadBook":"ٹی وی کلاسز ڈاؤن لوڈ کریں","downloadTVclasses":"ٹی وی کلاسز ڈاؤن لوڈ کریں","find_more":"مزید ٹی وی کلاسز اور متعلقہ مواد‪{instance}‬ پر تلاش کریں‪","find_more_TVclasses":"مزید ٹی وی کلاسز اور متعلقہ مواد‪{instance} ‬ پر تلاش کریں","updateTextbook":"ٹی وی کلاسز اپ ڈیٹ کریں","updateTVclasses":"ٹی وی کلاسز اپ ڈیٹ کریں"},"downloadBooks":"آف لائن رہتے ہوئے تک رسائی حاصل کرنے کے لئے ٹی وی کلاسز ڈاؤن لوڈ کریں","downloadTVclasses":"آف لائن رہتے ہوئے ٹی وی کلاسز تک رسائی حاصل کرنے کے لئے انھیں ڈاؤن لوڈ کریں","fromTheTextBook":"ٹی وی کلاس سے","fromTheTVclasses":"ٹی وی کلاس سے","noBookfoundTitle":"بورڈ ٹی وی کلاس کو شامل کررہا ہے","textbooks":"ٹی وی کلاسز","TVclassesfoundTitle":"بورڈ ٹی وی کلاس کو شامل کررہا ہے","tv_classes":"ٹی وی کلاسز","tv_program":"ٹی وی پروگرام"}}},"trk":{"frmelmnts":{"btn":{"enroll":"دیکھو","resumecourse":"دوبارہ دیکھنا شروع کریں"},"instn":{"t0062":"آپ نے ابھی تک اس ٹی وی کلاس کے لئے کوئی سیکھنے والا بیچ نہیں بنایا ہے۔ ایک بیچ بنائیں اور ڈیش بورڈ چیک کریں","t0063":"آپ نے ابھی تک کوئی ٹی وی کلاس نہیں بنائی ہے۔ ایک ٹی وی کلاس بنائیں اور ڈیش بورڈ چیک کریں"},"lbl":{"accessCourse":"ٹی وی کلاسز تک رسائی حاصل کریں","accessToLogin":"ٹی وی کلاس تک رسائی حاصل کرنے کے لئے آپ کو لاگ کر سیکھنے والے بیچ میں شامل ہونا ہوگا","ActivityCourses":"ٹی وی کلاسز","ACTIVITY_COURSE_TITLE":"ٹی وی کلاسز","addCourse":"ٹی وی کلاس شامل کریں","completedCourse":"مکمل ٹی وی کلاسز","copyAsCourse":"ٹی وی کلاس کے بطور نقل کریں","courseContainCertificate":"یہ تعلیم آپ کو ایک سرٹیفیکیٹ پیش کرتی ہے","courseDetails":"ٹی وی کلاس کی تفصیلات","courses":"ٹی وی کلاسز","coursestructure":"ٹی وی پروگرام","moduleFinish":"آپ نے یہ پروگرام مکمل کرلیا ہے","moduleProgress":"پروگرام کی پیشرفت","mytrainings":"میرے ٹی وی کلاسز","nextModule":"اگلا پروگرام","oneCourse":"ٹی وی کلاس","prevModule":"پچھلا پروگرام","sectionTitle":"ٹی وی کلاسز","selectChapter":"پروگرام منتخب کریں","trainingAttended":"ٹی وی کلاسز دیکھی گئی","courseDontContainCertificate":"فی الحال ، اس سیکھنے کے کام کے پاس سرٹیفیکیٹ نہیں ہے۔ ٹاسک تخلیق کار بعد میں ایک سرٹیفیکیٹ منسلک کرسکتا ہے"},"tab":{"courses":"ٹی وی کلاسز"}},"messages":{"emsg":{"m0002":"یہ ٹی وی کلاس ٹاسک اب دستیاب نہیں ہے"},"fmsg":{"m0001":"معذرت! ہم ٹی وی کی کلاسیں حاصل نہیں کر سکتے تھے جو آپ تلاش کر رہے تھے. بعد میں پھر کوشش کریں","m0002":"معذرت! ہم آپ کے لئے ٹی وی کی دوسری کلاسیں نہیں لے سکے۔ بعد میں دوبارہ کوشش کریں","m0086":"یہ ٹی وی کلاس اب دستیاب نہیں ہے"}}}}}

From bc33b71cee237067220bd21fde22ae6562788196 Mon Sep 17 00:00:00 2001
From: Harsha <harshavardhanc95@gmail.com>
Date: Mon, 7 Dec 2020 12:43:41 +0530
Subject: [PATCH 057/184] nodebb config and nginx changes  (#2073)

* replacing host with uri for mongodb

* nginx route for nodebb ui

* nginx route for nodebb ui

* nginx route for nodebb ui

* nginx route for nodebb

* nginx route for nodebb
---
 ansible/inventory/env/group_vars/all.yml      |  2 +-
 .../templates/configmap.yaml                  |  5 ++++
 .../core/nginx-public-ingress/values.j2       | 26 +++++++++++++++++++
 .../core/nodebb/templates/deployment.yaml     |  5 ++--
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index 3012f6009..445a29e68 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -649,4 +649,4 @@ group_activity_agg_cache_enable: false
 
 # nodebb variables
 sunbird_nodebb_storage_key: "{{ core_vault_sunbird_nodebb_storage_key }}"
-mongo_nodebb_host: "{{ groups['mongo'] | join ',' }}"
+mongo_nodebb_host: "{{ groups['mongo'] | join(':27017,')}}:27017"
diff --git a/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml b/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
index 8b25a0cd7..a79679825 100644
--- a/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
+++ b/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
@@ -136,6 +136,11 @@ data:
           rewrite ^/enc/(.*) /$1 break;
           proxy_pass $target;
         }
+        location /nodebb/ {
+          set $target http://nodebb-service.{{ .Values.namespace }}.svc.cluster.local:4567;
+          rewrite ^/enc/(.*) /$1 break;
+          proxy_pass $target;
+        }
       }
     }
 kind: ConfigMap
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 07abf6f6e..5fccc4434 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -571,6 +571,32 @@ proxyconfig: |-
       proxy_set_header X-Request-ID $sb_request_id;
       proxy_pass             https://$s3_bucket/content-editor/$url_full;
   }
+
+    location ~* ^/discussion-ui/(.*) {
+          # Enabling compression
+          gzip            on;
+          gzip_min_length 100000;
+          gzip_proxied    expired no-cache no-store private auth;
+          gzip_types application/javascript application/x-javascript text/css text/javascript;
+      set $s3_bucket        "{{discussion_upstream_url}}";
+      set $url_full         '$1';
+      proxy_http_version     1.1;
+      proxy_set_header       Host "{{discussion_upstream_url.split('/')[0]|lower}}";
+      proxy_set_header       Authorization '';
+      proxy_hide_header      Access-Control-Allow-Origin;
+      proxy_hide_header      Access-Control-Allow-Methods;
+      proxy_hide_header      x-amz-id-2;
+      proxy_hide_header      x-amz-request-id;
+      proxy_hide_header      Set-Cookie;
+      proxy_ignore_headers   "Set-Cookie";
+      proxy_buffering        off;
+      proxy_intercept_errors on;
+      add_header             Access-Control-Allow-Origin "*" ;
+      add_header             Access-Control-Allow-Methods GET;
+      proxy_set_header X-Request-ID $sb_request_id;
+      proxy_pass             https://$s3_bucket/discussion-ui/$url_full;
+  }
+
     location ~* ^/collection-editor/(.*) {
           # Enabling compression
           gzip            on;
diff --git a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
index ef395da3a..46b2eb8a4 100644
--- a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
@@ -62,9 +62,8 @@ data:
          "secret": "100101",
          "database": "mongo",
          "port": "4567",
-         "redis": {
-             "host": "{{ .Values.mongo_nodebb_host }}",
-             "port": 27017,
+         "mongo": {
+             "uri": "mongodb://{{ .Values.mongo_nodebb_host }}",
              "username": "",
              "password": "",
          }

From 78dde442067e22522314973bb83c821ac9a022eb Mon Sep 17 00:00:00 2001
From: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Date: Tue, 8 Dec 2020 11:53:16 +0530
Subject: [PATCH 058/184] Desktop Build and Deploy Automation Scripts with
 Jenkinspipeline, Docker containers, Ansbile, Shell Scripts and custom logic.
 (#2075)

* Add new files for offline desktop build automation

* Making unzip before running playbook

* Removing artifact folder refrernce

* Fixing indentation issues in jenkinspipeline

* Adding the logic to build the Env specific Builder Artifacts

* Adding build script changes to offline installer

* Adding the logic to run the build script

* Making changes to the repo name

* Deploy artifacts logic changes

* Rewriting the offline desktop deploy logic

* Changing the upload logic of the offline installer

* Making changes to the jenkinsfile so that we have a unified pipeline structure

* Removing unused role which existed earlier

* Making changes to jenkinsfile to have jenkins local variables for parsing env directory

* Adding jenkinsfile changes to remove docker image if it existed

* Removing docker image if it exists

* Adding correct location for downloading built package

* Remove the assets copying from jenkinspipeline

* Let ansible handle assets copy

* Artifact name parsing logic change

* Having the correct docker image name to be removed as part of resource cleanup for next build and deployment

* Remove the logic of zipping the artifacts

* Adding logic of removing the docker image in finally step rather than middle

* Making shell module in a single line

* Removing unwanted code in JenkinsPipeline
---
 ansible/offline-installer.yml                 |   3 +-
 .../defaults/main.yml                         |   0
 ansible/roles/desktop-deploy/tasks/main.yml   |  76 +++++++++++++
 .../desktop-deploy/templates/build.sh.j2      |  28 +++++
 .../roles/desktop-deploy/templates/envfile.j2 |   3 +
 .../templates/setupOfflineInstaller.sh.j2     |  15 +--
 .../offline-installer-deploy/tasks/main.yml   |  50 ---------
 .../offline-installer-deploy/tasks/remove.yml |   8 --
 .../tasks/uploadToAzure.yml                   | 103 ------------------
 .../templates/32-bit-prerequisite.sh.j2       |   7 --
 .../templates/Dockerfile.j2                   |  13 ---
 .../templates/artifacts.sh.j2                 |  15 ---
 .../templates/build.sh.j2                     |  18 ---
 .../templates/env.json.j2                     |  10 --
 .../templates/envfile.j2                      |   3 -
 .../templates/metadata.sh.j2                  |   8 --
 pipelines/offlineinstaller/Jenkinsfile        |  91 +++++-----------
 17 files changed, 143 insertions(+), 308 deletions(-)
 rename ansible/roles/{offline-installer-deploy => desktop-deploy}/defaults/main.yml (100%)
 create mode 100644 ansible/roles/desktop-deploy/tasks/main.yml
 create mode 100644 ansible/roles/desktop-deploy/templates/build.sh.j2
 create mode 100644 ansible/roles/desktop-deploy/templates/envfile.j2
 rename ansible/roles/{offline-installer-deploy => desktop-deploy}/templates/setupOfflineInstaller.sh.j2 (63%)
 delete mode 100644 ansible/roles/offline-installer-deploy/tasks/main.yml
 delete mode 100644 ansible/roles/offline-installer-deploy/tasks/remove.yml
 delete mode 100644 ansible/roles/offline-installer-deploy/tasks/uploadToAzure.yml
 delete mode 100644 ansible/roles/offline-installer-deploy/templates/32-bit-prerequisite.sh.j2
 delete mode 100644 ansible/roles/offline-installer-deploy/templates/Dockerfile.j2
 delete mode 100644 ansible/roles/offline-installer-deploy/templates/artifacts.sh.j2
 delete mode 100644 ansible/roles/offline-installer-deploy/templates/build.sh.j2
 delete mode 100644 ansible/roles/offline-installer-deploy/templates/env.json.j2
 delete mode 100644 ansible/roles/offline-installer-deploy/templates/envfile.j2
 delete mode 100644 ansible/roles/offline-installer-deploy/templates/metadata.sh.j2

diff --git a/ansible/offline-installer.yml b/ansible/offline-installer.yml
index d2ee56b9e..24e511c3d 100644
--- a/ansible/offline-installer.yml
+++ b/ansible/offline-installer.yml
@@ -1,7 +1,6 @@
 ---
 - hosts: local
-  become: yes
   vars_files:
     - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
   roles:
-    - offline-installer-deploy
+    - desktop-deploy
diff --git a/ansible/roles/offline-installer-deploy/defaults/main.yml b/ansible/roles/desktop-deploy/defaults/main.yml
similarity index 100%
rename from ansible/roles/offline-installer-deploy/defaults/main.yml
rename to ansible/roles/desktop-deploy/defaults/main.yml
diff --git a/ansible/roles/desktop-deploy/tasks/main.yml b/ansible/roles/desktop-deploy/tasks/main.yml
new file mode 100644
index 000000000..0d301fbed
--- /dev/null
+++ b/ansible/roles/desktop-deploy/tasks/main.yml
@@ -0,0 +1,76 @@
+---
+- name: Copy the desktop assests folder from inside the private repo location to root location.
+  shell: "cp -r {{offline_repo_location}}/private/desktop-assets {{offline_repo_location}}/"
+
+- name: get the date and time for the artifact
+  set_fact:
+    time: "{{ lookup('pipe', 'date +\"%Y-%b-%d\"') }}-{{offline_installer_type}}"
+
+- name: create a directory to store artifacts
+  file:
+    path: "{{offline_repo_location}}/desktop_uploader_assets/{{time}}"
+    state: directory
+    recurse: yes
+
+- name: Get the environment name for the artifact name
+  shell: "cat {{offline_repo_location}}/desktop-assets/{{offline_target_env}}/appConfig.json | jq -r '.APP_NAME'"
+  register: env_name
+
+- name: Display the environment name of the installer
+  debug:
+    msg: "{{env_name.stdout}}"
+
+- name: Create a variable to inject environment name to upload to azure blob
+  set_fact:
+    environment_name: "{{ env_name.stdout }}"
+
+- name: Get the version from the package.json file
+  shell: "cat {{offline_repo_location}}/app_dist/package.json | jq -r '.version'"
+  register: version
+
+- name: Display the version number of the installer
+  debug:
+    msg: "{{version.stdout}}"
+
+- name: Create a variable to inject version in the template
+  set_fact:
+    installer_version: "{{ version.stdout }}"
+
+- name: copy the installer script file and build script for building offline installer
+  template:
+    src: "{{item}}.j2"
+    dest: "{{offline_repo_location}}/{{item}}"
+    mode: '0755'
+  with_items:
+    - build.sh
+    - envfile
+    - setupOfflineInstaller.sh
+
+- name: run the installer script
+  shell: "bash -x {{offline_repo_location}}/build.sh"
+
+- name: Ensure azure blob storage container exists
+  command: az storage container create  --name {{offline_installer_container_name}} --public-access blob
+  environment:
+    AZURE_STORAGE_ACCOUNT: "{{sunbird_public_storage_account_name}}"
+    AZURE_STORAGE_KEY: "{{sunbird_public_storage_account_key}}"
+
+- name: Upload to azure blob storage
+  command: az storage blob upload-batch --destination {{offline_installer_container_name}} --source "desktop_uploader_assets"
+  args:
+    chdir: "{{offline_repo_location}}/"
+  environment:
+    AZURE_STORAGE_ACCOUNT: "{{sunbird_public_storage_account_name}}"
+    AZURE_STORAGE_KEY: "{{sunbird_public_storage_account_key}}"
+  async: 60
+  poll: 10
+
+- name: Upload to latest.json file to blob
+  command: az storage blob upload-batch --destination "{{offline_installer_container_name}}/latest" --source "{{offline_repo_location}}/desktop_uploader_assets/{{time}}/"
+  args:
+    chdir: "{{offline_repo_location}}/"
+  environment:
+    AZURE_STORAGE_ACCOUNT: "{{sunbird_public_storage_account_name}}"
+    AZURE_STORAGE_KEY: "{{sunbird_public_storage_account_key}}"
+  async: 60
+  poll: 10
diff --git a/ansible/roles/desktop-deploy/templates/build.sh.j2 b/ansible/roles/desktop-deploy/templates/build.sh.j2
new file mode 100644
index 000000000..2f431915e
--- /dev/null
+++ b/ansible/roles/desktop-deploy/templates/build.sh.j2
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -eo pipefail
+
+cd {{offline_repo_location}}/
+
+# Run the docker image and run the OS Specific build along with environment specific build
+docker run -d --env-file envfile  --env ELECTRON_CACHE="/root/.cache/electron"  --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" --name offline_deploy -w /project electronuserland/builder:wine sleep infinity
+docker cp . offline_deploy:/project/
+docker exec offline_deploy bash -x /project/setupOfflineInstaller.sh
+
+# Copy the built artifacts
+if [ "{{offline_installer_type}}" == "windows32bit" ];
+then
+    docker cp 'offline_deploy:/project/app_dist/dist/{{installer_version}}/win/ia32/{{environment_name}} Setup {{installer_version}}.exe' '{{offline_repo_location}}/desktop_uploader_assets/{{time}}/{{environment_name}}_{{installer_version}}_windows32bit.exe'
+
+    elif [ "{{offline_installer_type}}" == "windows64bit" ];
+    then
+        docker cp 'offline_deploy:/project/app_dist/dist/{{installer_version}}/win/x64/{{environment_name}} Setup {{installer_version}}.exe' '{{offline_repo_location}}/desktop_uploader_assets/{{time}}/{{environment_name}}_{{installer_version}}_windows64bit.exe'
+
+          elif [ "{{offline_installer_type}}" == "linux64bit" ];
+          then
+              docker cp 'offline_deploy:/project/app_dist/dist/{{installer_version}}/linux/x64/{{environment_name}}_{{installer_version}}_amd64.deb' '{{offline_repo_location}}/desktop_uploader_assets/{{time}}/{{environment_name}}_{{installer_version}}_linux64bit.deb'
+fi
+
+# Generate the latest.json file
+echo "{\"version\":\"{{installer_version}}\",\"windows\":{\"32bit\":\"{{environment_name}}_{{installer_version}}_windows32bit.exe\",\"64bit\":\"{{environment_name}}_{{installer_version}}_windows64bit.exe\"},\"linux\":{\"64bit\":\"{{environment_name}}_{{installer_version}}_linux64bit.deb\"}}" | jq '.' | tee -a '{{offline_repo_location}}/desktop_uploader_assets/{{time}}/latest.json'
+
+echo "Build the installer succesfully"
diff --git a/ansible/roles/desktop-deploy/templates/envfile.j2 b/ansible/roles/desktop-deploy/templates/envfile.j2
new file mode 100644
index 000000000..576b57e74
--- /dev/null
+++ b/ansible/roles/desktop-deploy/templates/envfile.j2
@@ -0,0 +1,3 @@
+offline_desktop_assets_token={{offline_desktop_assets_token}}
+offline_target_env={{offline_target_env}}
+offline_app_base_url_token={{offline_app_base_url_token}}
diff --git a/ansible/roles/offline-installer-deploy/templates/setupOfflineInstaller.sh.j2 b/ansible/roles/desktop-deploy/templates/setupOfflineInstaller.sh.j2
similarity index 63%
rename from ansible/roles/offline-installer-deploy/templates/setupOfflineInstaller.sh.j2
rename to ansible/roles/desktop-deploy/templates/setupOfflineInstaller.sh.j2
index 84f24a3c1..f569c990e 100644
--- a/ansible/roles/offline-installer-deploy/templates/setupOfflineInstaller.sh.j2
+++ b/ansible/roles/desktop-deploy/templates/setupOfflineInstaller.sh.j2
@@ -1,27 +1,22 @@
 #!/bin/bash
 
-# Downgrade the node version
-npm install -g n
-n 8.16
-cd /project/src
+cd /project/app_dist
 
 if [ "{{offline_installer_type}}" != "windows32bit" ];
 then
-#Build the offline installer
-        npm install
-        npm run dist
+      #Build the offline installer
+      yarn install
+      node scripts/metadata.js
+      rm -rf scripts
 fi
 
 if [ "{{offline_installer_type}}" == "windows32bit" ];
 then
-#       npm run dist
         npm run dist-win32
 elif [ "{{offline_installer_type}}" == "windows64bit" ];
 then
-        npm install
         npm run dist-win64
 elif [ "{{offline_installer_type}}" == "linux64bit" ];
 then
-        npm install
         npm run dist-linux
 fi
diff --git a/ansible/roles/offline-installer-deploy/tasks/main.yml b/ansible/roles/offline-installer-deploy/tasks/main.yml
deleted file mode 100644
index 31bc47f62..000000000
--- a/ansible/roles/offline-installer-deploy/tasks/main.yml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-- name: get the date and time for the artifact
-  set_fact:
-    time: "{{ lookup('pipe', 'date +\"%Y-%b-%d-%H-%M-%S\"') }}-{{offline_installer_type}}"
-  when: uploadInstaller is not defined
-
-- name: copy the env.json file to the repo
-  template:
-    src: "{{item}}.j2"
-    dest: "{{offline_repo_location}}/offline-installer-repo/src/{{item}}"
-    mode: '0755'
-  with_items:
-    - env.json
-  when: uploadInstaller is not defined
-
-- name: copy the installer script file and build script for building offline installer
-  template:
-    src: "{{item}}.j2"
-    dest: "{{offline_repo_location}}/offline-installer-repo/{{item}}"
-    mode: '0755'
-  with_items:
-    - build.sh
-    - envfile
-    - 32-bit-prerequisite.sh
-  when: uploadInstaller is not defined
-
-- name: create a directory to store artifacts
-  file:
-    path: "{{offline_repo_location}}/offline-installer-repo/offline_artifacts/{{time}}"
-    state: directory
-    recurse: yes
-  when: uploadInstaller is not defined
-
-- name: copy the installer script file and build script for building offline installer
-  template:
-    src: "{{item}}.j2"
-    dest: "{{offline_repo_location}}/offline-installer-repo/{{item}}"
-    mode: '0755'
-  with_items:
-    - setupOfflineInstaller.sh
-  when: uploadInstaller is not defined
-
-- name: upload to azure
-  include: uploadToAzure.yml
-  when: uploadInstaller is defined
-
-- name: Delete offline installer folder if any issue
-  include: remove.yml
-  when: removeOfflineInstallerFolder is defined
-
diff --git a/ansible/roles/offline-installer-deploy/tasks/remove.yml b/ansible/roles/offline-installer-deploy/tasks/remove.yml
deleted file mode 100644
index da1512de9..000000000
--- a/ansible/roles/offline-installer-deploy/tasks/remove.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- name: Delete offline installer repo
-  file:
-    path: "{{offline_repo_location}}/offline-installer-repo/"
-    state: absent
-
-- name: Notify build failure
-  fail:
-    msg: "Please check the build script, it had been failed"
diff --git a/ansible/roles/offline-installer-deploy/tasks/uploadToAzure.yml b/ansible/roles/offline-installer-deploy/tasks/uploadToAzure.yml
deleted file mode 100644
index aa7c01b65..000000000
--- a/ansible/roles/offline-installer-deploy/tasks/uploadToAzure.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-- name: Ensure azure blob storage container exists
-  command: az storage container create  --name {{offline_installer_container_name}} --public-access blob
-  environment:
-    AZURE_STORAGE_ACCOUNT: "{{sunbird_public_storage_account_name}}"
-    AZURE_STORAGE_KEY: "{{sunbird_public_storage_account_key}}"
-
-- name: Get the environment name for the artifact name
-  shell: "cat {{offline_repo_location}}/offline-installer-repo/src/package.json | jq -r '.name'"
-  register: env_name
-
-- name: Display the environment name of the installer
-  debug:
-    msg: "{{env_name.stdout}}"
-
-- name: Create a variable to inject environment name to upload to azure blob
-  set_fact:
-    environment_name: "{{ env_name.stdout }}"
-
-- name: Get the version from the package.json file
-  shell: "cat {{offline_repo_location}}/offline-installer-repo/src/package.json | jq -r '.version'"
-  register: version
-
-- name: Display the version number of the installer
-  debug:
-    msg: "{{version.stdout}}"
-
-- name: Create a variable to inject version in the template
-  set_fact:
-    installer_version: "{{ version.stdout }}"
-
-- name: get the directory name
-  shell: "ls {{offline_repo_location}}/offline-installer-repo/offline_artifacts/"
-  register: folderName
-
-- debug:
-    msg: "{{folderName.stdout}}"
-
-- name: set the folder name to copy the artifacts
-  set_fact:
-    time: "{{folderName.stdout}}"
-
-- name: copy the installer artifacts and metadata files to upload it to azure blob and generate latest.json file
-  template:
-    src: "{{item}}.j2"
-    dest: "{{offline_repo_location}}/offline-installer-repo/{{item}}"
-    mode: '0755'
-  with_items:
-    - artifacts.sh
-    - metadata.sh
-
-- name: copy the artifacts and generate the metadata file
-  shell: "bash {{offline_repo_location}}/offline-installer-repo/{{item}}"
-  args:
-    chdir: "{{offline_repo_location}}/offline-installer-repo/"
-  with_items:
-    - artifacts.sh
-    - metadata.sh
-
-- name: Upload to azure blob storage
-  command: az storage blob upload-batch --destination {{offline_installer_container_name}} --source "offline_artifacts"
-  args:
-    chdir: "{{offline_repo_location}}/offline-installer-repo/"
-  environment:
-    AZURE_STORAGE_ACCOUNT: "{{sunbird_public_storage_account_name}}"
-    AZURE_STORAGE_KEY: "{{sunbird_public_storage_account_key}}"
-  async: 60
-  poll: 10
-
-- name: Upload to latest.json file to blob
-  command: az storage blob upload-batch --destination "{{offline_installer_container_name}}/latest" --source "{{folderName.stdout}}"
-  args:
-    chdir: "{{offline_repo_location}}/offline-installer-repo/offline_artifacts/"
-  environment:
-    AZURE_STORAGE_ACCOUNT: "{{sunbird_public_storage_account_name}}"
-    AZURE_STORAGE_KEY: "{{sunbird_public_storage_account_key}}"
-  async: 60
-  poll: 10
-
-- name: Create a zip of the folder to archieve the artifact
-  archive:
-    path:
-    - "{{offline_repo_location}}/offline-installer-repo/offline_artifacts/{{folderName.stdout}}"
-    dest: "{{offline_repo_location}}/{{offline_installer_type}}.zip"
-    owner: jenkins
-    group: jenkins
-    format: zip
-
-- name: copy latest.json file to archieve it in jenkins
-  copy:
-    src: "{{offline_repo_location}}/offline-installer-repo/offline_artifacts/{{folderName.stdout}}/latest.json"
-    dest: "{{offline_repo_location}}/latest.json"
-    owner: jenkins
-    group: jenkins
-    remote_src: yes
-
-- name: change the ownership of the directory to jenkins user
-  file:
-    path: "{{offline_repo_location}}"
-    state: directory
-    recurse: yes
-    owner: jenkins
-    group: jenkins
-
diff --git a/ansible/roles/offline-installer-deploy/templates/32-bit-prerequisite.sh.j2 b/ansible/roles/offline-installer-deploy/templates/32-bit-prerequisite.sh.j2
deleted file mode 100644
index cbfa755b0..000000000
--- a/ansible/roles/offline-installer-deploy/templates/32-bit-prerequisite.sh.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-#Build the offline installer
-cd /private/src/
-rm -rf node_modules
-npm install leveldown --verbose
-npm run dist
diff --git a/ansible/roles/offline-installer-deploy/templates/Dockerfile.j2 b/ansible/roles/offline-installer-deploy/templates/Dockerfile.j2
deleted file mode 100644
index 348c4c6e0..000000000
--- a/ansible/roles/offline-installer-deploy/templates/Dockerfile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-#FROM electronuserland/builder:wine
-#MAINTAINER "S M Y ALTAMASH" "<smy.altamash@gamil.com>"
-#ENV ELECTRON_CACHE="/root/.cache/electron"
-#ENV ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder"
-#ENV GITHUB_ACCESS_TOKEN={{offline_git_access_token}}
-#ENV GITHUB_PRIVATE_REPO={{offline_git_private_repo}}
-#ENV TARGET_ENVIRONMENT={{offline_target_env}}
-#WORKDIR /private/
-#ADD . /private/
-#WORKDIR /private/src/
-#CMD npm install && npm run dist
-#CMD npm run dist-win64
-#CMD npm run dist-linux
diff --git a/ansible/roles/offline-installer-deploy/templates/artifacts.sh.j2 b/ansible/roles/offline-installer-deploy/templates/artifacts.sh.j2
deleted file mode 100644
index ea5db269d..000000000
--- a/ansible/roles/offline-installer-deploy/templates/artifacts.sh.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-
-if [ "{{offline_installer_type}}" == "windows32bit" ];
-then
-        cp '{{offline_repo_location}}/offline-installer-repo/src/dist/{{installer_version}}/win/ia32/{{environment_name}} Setup {{installer_version}}.exe' offline_artifacts/{{time}}/{{environment_name}}_{{installer_version}}_windows32bit.exe
-elif [ "{{offline_installer_type}}" == "windows64bit" ];
-then
-        cp '{{offline_repo_location}}/offline-installer-repo/src/dist/{{installer_version}}/win/x64/{{environment_name}} Setup {{installer_version}}.exe' offline_artifacts/{{time}}/{{environment_name}}_{{installer_version}}_windows64bit.exe
-elif [ "{{offline_installer_type}}" == "linux64bit" ];
-then
-        cp '{{offline_repo_location}}/offline-installer-repo/src/dist/{{installer_version}}/linux/x64/{{environment_name}}_{{installer_version}}_amd64.deb' offline_artifacts/{{time}}/{{environment_name}}_{{installer_version}}_linux64bit.deb
-fi
-
-
diff --git a/ansible/roles/offline-installer-deploy/templates/build.sh.j2 b/ansible/roles/offline-installer-deploy/templates/build.sh.j2
deleted file mode 100644
index 720b64b8c..000000000
--- a/ansible/roles/offline-installer-deploy/templates/build.sh.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-echo "Offline Installer for Sunbird"
-
-# Build script
-set -eo pipefail
-
-if [ "{{offline_installer_type}}" == "windows32bit" ];
-then
-
-	docker run --rm -v ${PWD}:/private/ i386/node:8.16.2-stretch bash -x /private/32-bit-prerequisite.sh
-
-fi
-
-#chmod +x setupOfflineInstaller.sh
-docker run --rm --env-file envfile  --env ELECTRON_CACHE="/root/.cache/electron"  --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder"  -v ${PWD}:/project electronuserland/builder:wine bash -x setupOfflineInstaller.sh
-
-echo "Build the installer succesfully"
diff --git a/ansible/roles/offline-installer-deploy/templates/env.json.j2 b/ansible/roles/offline-installer-deploy/templates/env.json.j2
deleted file mode 100644
index 8705f96ab..000000000
--- a/ansible/roles/offline-installer-deploy/templates/env.json.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "APP_BASE_URL": "https://sunbird.org",
-  "CHANNEL": "sunbird",
-  "TELEMETRY_SYNC_INTERVAL_IN_SECS": 30,
-  "APP_ID": "local.sunbird.desktop",
-  "TELEMETRY_PACKET_SIZE": 200,
-  "APP_BASE_URL_TOKEN": "{{offline_app_base_url_token}}",
-  "APP_NAME": "SUNBIRD",
-  "MODE": "standalone"
-}
diff --git a/ansible/roles/offline-installer-deploy/templates/envfile.j2 b/ansible/roles/offline-installer-deploy/templates/envfile.j2
deleted file mode 100644
index 9b98165e0..000000000
--- a/ansible/roles/offline-installer-deploy/templates/envfile.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-GITHUB_ACCESS_TOKEN={{offline_git_access_token}}
-GITHUB_PRIVATE_REPO={{offline_git_private_repo}}
-TARGET_ENVIRONMENT={{offline_target_env}}
diff --git a/ansible/roles/offline-installer-deploy/templates/metadata.sh.j2 b/ansible/roles/offline-installer-deploy/templates/metadata.sh.j2
deleted file mode 100644
index 9d7e7a0dd..000000000
--- a/ansible/roles/offline-installer-deploy/templates/metadata.sh.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-env_name={{environment_name}}
-version={{installer_version}}
-artifactFolder=$(find offline_artifacts/* -type d)
-
-# constructing the latest.json file
-echo "{\"version\":\"${version}\",\"windows\":{\"32bit\":\"${env_name}_${version}_windows32bit.exe\",\"64bit\":\"${env_name}_${version}_windows64bit.exe\"},\"linux\":{\"64bit\":\"${env_name}_${version}_linux64bit.deb\"}}" | jq '.' | tee -a {{offline_repo_location}}/offline-installer-repo/${artifactFolder}/latest.json
diff --git a/pipelines/offlineinstaller/Jenkinsfile b/pipelines/offlineinstaller/Jenkinsfile
index 30856efc0..94ef72b08 100644
--- a/pipelines/offlineinstaller/Jenkinsfile
+++ b/pipelines/offlineinstaller/Jenkinsfile
@@ -1,5 +1,4 @@
 @Library('deploy-conf') _
-// node('jenkins-offline-slave') {
 node() {
     try {
         String ANSI_GREEN = "\u001B[32m"
@@ -8,76 +7,46 @@ node() {
         String ANSI_RED = "\u001B[31m"
         String ANSI_YELLOW = "\u001B[33m"
 
-        stage('checkout offline installer repo') {
-            cleanWs()
+        stage('checkout public repo') {
+            folder = new File("$WORKSPACE/.git")
+            if (folder.exists())
+            {
+               println "Found .git folder. Clearing it.."
+               sh'git clean -fxd'
+            }
             checkout scm
-              sh """
-		git clone https://github.com/Sunbird-Ed/sunbird-desktop-app.git -b ${sunbirded_installer_branch_or_tag} offline-installer-repo
-	      """
         }
             ansiColor('xterm') {
-                    envDir = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-3].trim()
-                    module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim()
-                    jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
-		    currentWs = sh(returnStdout: true, script: 'pwd').trim()
-                    stage('Pre requisites for installer') {
-			values = [:]
-                    	ansiblePlaybook = "${currentWs}/ansible/offline-installer.yml --vault-password-file /var/lib/jenkins/secrets/vault-pass "
-		    	ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs offline_installer_type=${offline_installer_type}\" -vv"
-		        values.put('currentWs', currentWs)
-		        values.put('env', envDir)
-                	values.put('module', module)
-                	values.put('jobName', jobName)
-                    	values.put('ansiblePlaybook', ansiblePlaybook)
-                    	values.put('ansibleExtraArgs', ansibleExtraArgs)
-                    	println values
-                    	ansible_playbook_run(values)
+                stage('get artifact') {
+                    values = lp_dp_params()
+                    currentWs = sh(returnStdout: true, script: 'pwd').trim()
+                    artifact = values.artifact_name + ":" + values.artifact_version
+                    values.put('currentWs', currentWs)
+                    values.put('artifact', artifact)
+                    artifact_download(values)
+                    sh """
+                       unzip ${artifact}
+                       tar -xvzf app_dist.tar.gz
+                    """
                 }
-		try {
-		     stage('Build Installer, create and upload it to azure') {
-			dir('offline-installer-repo') {
-			    sh """
-                               bash -x build.sh
-		             """
-			}
-			values = [:]
-                        ansiblePlaybook = "${currentWs}/ansible/offline-installer.yml --vault-password-file /var/lib/jenkins/secrets/vault-pass "
-                        ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs uploadInstaller=True offline_installer_type=${offline_installer_type}\""
-                        values.put('currentWs', currentWs)
-                        values.put('env', envDir)
-                        values.put('module', module)
-                        values.put('jobName', jobName)
-                        values.put('ansiblePlaybook', ansiblePlaybook)
-                        values.put('ansibleExtraArgs', ansibleExtraArgs)
-                        println values
-                        ansible_playbook_run(values)
-			archiveArtifacts artifacts: '*.zip', onlyIfSuccessful: true
-			archiveArtifacts artifacts: 'latest.json', onlyIfSuccessful: true
-		     }
-		}
-		catch (err) {
-			values = [:]
-                        ansiblePlaybook = "${currentWs}/ansible/offline-installer.yml --vault-password-file /var/lib/jenkins/secrets/vault-pass "
-                        ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs removeOfflineInstallerFolder=True offline_installer_type=${offline_installer_type}\""
-                        values.put('currentWs', currentWs)
-                        values.put('env', envDir)
-                        values.put('module', module)
-                        values.put('jobName', jobName)
-                        values.put('ansiblePlaybook', ansiblePlaybook)
-                        values.put('ansibleExtraArgs', ansibleExtraArgs)
-                        println values
-                        ansible_playbook_run(values)
-                        currentBuild.result = 'SUCCESS'
-		     }
-        }
+                stage('Install the offline desktop Application') {
+                      ansiblePlaybook = "${currentWs}/ansible/offline-installer.yml --vault-password-file /var/lib/jenkins/secrets/vault-pass "
+                      ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs offline_installer_type=${offline_installer_type}\" -vv"
+                      values.put('ansiblePlaybook', ansiblePlaybook)
+                      values.put('ansibleExtraArgs', ansibleExtraArgs)
+                      println values
+                      ansible_playbook_run(values)
+                }
+
+            }
         summary()
-            
-    }
+     }
     catch (err) {
         currentBuild.result = "FAILURE"
         throw err
     }
     finally {
+        sh "docker rm -f offline_deploy || true"
         slack_notify(currentBuild.result)
         email_notify()
     }

From 0b2af50cdbe3a8bab089f26bb87df7e6f3d07d08 Mon Sep 17 00:00:00 2001
From: kaliraja <34502260+Kaali09@users.noreply.github.com>
Date: Tue, 8 Dec 2020 16:26:14 +0530
Subject: [PATCH 059/184] redis multiprocess monitoring alertrules (#2058)

* Issue #0000: updated the redis alert rules

* Issue #0000: updated the redis alert rules

* Issue #0000: added the redis alert rules
---
 .../roles/sunbird-monitoring/defaults/main.yml     |  2 ++
 .../sunbird-monitoring/templates/alertrules.yaml   |  5 +++++
 .../alertrules/templates/promrulesDruid.yml        |  2 +-
 .../alertrules/templates/promrulesProcess.yml      | 14 ++++++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
index 931267c55..942d95e64 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
@@ -208,3 +208,5 @@ alertmanager_spec_overrides:
 
 druid_raw_ingestion_lag_threshold: 200000
 druid_rollup_ingestion_lag_threshold: 200000
+rollup_druid_datasource: ""
+redis_process_names: ""
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
index 4971aff4d..ed09e111c 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
@@ -58,6 +58,8 @@ raw_druid_datasource:
 
 druid_raw_ingestion_threshold: "{{ druid_raw_ingestion_lag_threshold | default(200000) }}"
 druid_rollup_ingestion_threshold: "{{ druid_rollup_ingestion_lag_threshold  | default(200000)}}"
+rollup_druid_datasource:
+  {{ rollup_druid_datasource | to_yaml | indent( width=2) }}
 
 secor_process_names:
   - channel-telemetry-backup
@@ -79,3 +81,6 @@ secor_process_names:
   - ingestion-telemetry-backup
   - ingestion-cluster-telemetry-backup
   - telemetry-ingest-backup
+
+redis_process_names:
+  {{ redis_process_names | to_yaml | indent( width=2) }}
diff --git a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesDruid.yml b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesDruid.yml
index d6b702b21..303d05e71 100644
--- a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesDruid.yml
+++ b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesDruid.yml
@@ -57,7 +57,7 @@ spec:
     {{- end }}
     {{- end }}
 
-    {{- if .Values.rollup_druid_cluster }}
+    {{- if .Values.rollup_druid_datasource }}
     ## druid segment unavailable count alert
     {{ range $key := .Values.rollup_druid_datasource }}
     - alert: druid_segment_unavailable_count
diff --git a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml
index 39c76ee1a..dcf9b8aab 100644
--- a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml
+++ b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml
@@ -193,6 +193,20 @@ spec:
         job_id: Druid-MiddleManager
         alertname: MiddleManagerProcessNotRunning
 
+    {{- if .Values.redis_process_names }}
+    {{- range $key, $value := .Values.redis_process_names }}
+    - alert: redisserver_process_not_running_fatal
+      expr: sum without(state) (namedprocess_namegroup_states{groupname={{ $value | quote }}}) == 0 
+      for: 5m
+      labels:
+        severity: critical
+        module: dp_process
+      annotations:
+        message: The {{ $key }} redis process which runs on port {{ $value }} is not running.
+        summary: redis-server process is not running
+        job_id: Redis
+        alertname: RedisProcessNotRunning
+    {{- end }}
 
     - alert: redisserver_process_not_running_fatal
       expr: sum without(state) (namedprocess_namegroup_states{groupname="redis-server"}) == 0

From 9f35c4fa9fe369fc5a50bd50087ec6b491c416f8 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Wed, 9 Dec 2020 07:43:13 +0530
Subject: [PATCH 060/184] fixes negative stride ansible error when keys are
 zero (#2078)

* fixes negative stride ansible error when keys are zero

* fix: update keycount for keys
---
 kubernetes/ansible/roles/helm-deploy/defaults/main.yml | 6 +++---
 kubernetes/ansible/roles/helm-deploy/tasks/main.yml    | 2 +-
 kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index c8ac5d34f..6e960fbb8 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -98,7 +98,7 @@ adminutil_keys_values:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__device_keyprefix }}"
     keystart: "{{ adminutil__device_keystart }}"
-    keycount: "{{ adminutil__device_keystart + adminutil__device_keycount - 1 }}"
+    keycount: "{{ adminutil__device_keycount|int }}"
   role_to_run:
     - decrypt.yml
     - copy-to-helm.yml
@@ -107,7 +107,7 @@ adminutil_keys_values:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__access_keyprefix }}"
     keystart: "{{ adminutil__access_keystart }}"
-    keycount: "{{ adminutil__access_keystart + adminutil__access_keycount - 1 }}"
+    keycount: "{{ adminutil__access_keycount|int }}"
   role_to_run:
     - decrypt.yml
     - copy-to-helm.yml
@@ -116,7 +116,7 @@ adminutil_keys_values:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__desktop_keyprefix }}"
     keystart: "{{ adminutil__desktop_keystart }}"
-    keycount: "{{ adminutil__desktop_keystart + adminutil__desktop_keycount - 1 }}"
+    keycount: "{{ adminutil__desktop_keycount|int }}"
   role_to_run:
     - decrypt.yml
     - copy-to-helm.yml
diff --git a/kubernetes/ansible/roles/helm-deploy/tasks/main.yml b/kubernetes/ansible/roles/helm-deploy/tasks/main.yml
index 0ca459932..9ef163db2 100644
--- a/kubernetes/ansible/roles/helm-deploy/tasks/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/tasks/main.yml
@@ -22,7 +22,7 @@
     private_key_path: "{{ outer_item.0.values_to_pass.basepath }}"
     private_key_prefix: "{{ outer_item.0.values_to_pass.keyprefix }}"
     private_key_sign_start: "{{ outer_item.0.values_to_pass.keystart }}"
-    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '0'  }}"
+    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '1'  }}"
   when: release_name == "adminutils"
   with_subelements:
     - "{{adminutil_keys_values}}"
diff --git a/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml b/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
index 9d7ad2ee9..9a46ad013 100644
--- a/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
+++ b/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
@@ -26,7 +26,7 @@
     private_key_path: "{{ outer_item.0.values_to_pass.basepath }}"
     private_key_prefix: "{{ outer_item.0.values_to_pass.keyprefix }}"
     private_key_sign_start: "{{ outer_item.0.values_to_pass.keystart }}"
-    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '0'  }}"
+    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '1'  }}"
   when: release_name == "learner" or release_name == "lms" or release_name == "groups"
   with_subelements:
     - "{{adminutil_access_values}}"

From 139df1b21f96d4eb805bcb4bb77bc85c7a961443 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Wed, 9 Dec 2020 07:44:13 +0530
Subject: [PATCH 061/184] fixes negative stride ansible error when keys are
 zero (#2080)

* fix: update keycount for keys

* fixes negative stride ansible error when keys are zero
---
 kubernetes/ansible/roles/deploy-player/tasks/main.yml  | 2 +-
 kubernetes/ansible/roles/helm-deploy/defaults/main.yml | 6 +++---
 kubernetes/ansible/roles/helm-deploy/tasks/main.yml    | 2 +-
 kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kubernetes/ansible/roles/deploy-player/tasks/main.yml b/kubernetes/ansible/roles/deploy-player/tasks/main.yml
index 5213285e5..25fb73c77 100644
--- a/kubernetes/ansible/roles/deploy-player/tasks/main.yml
+++ b/kubernetes/ansible/roles/deploy-player/tasks/main.yml
@@ -40,7 +40,7 @@
     private_key_path: "{{ outer_item.0.values_to_pass.basepath }}"
     private_key_prefix: "{{ outer_item.0.values_to_pass.keyprefix }}"
     private_key_sign_start: "{{ outer_item.0.values_to_pass.keystart }}"
-    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '0'  }}"
+    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '1'  }}"
   when: release_name == "player"
   with_subelements:
     - "{{adminutil_access_values}}"
diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index c8ac5d34f..6e960fbb8 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -98,7 +98,7 @@ adminutil_keys_values:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__device_keyprefix }}"
     keystart: "{{ adminutil__device_keystart }}"
-    keycount: "{{ adminutil__device_keystart + adminutil__device_keycount - 1 }}"
+    keycount: "{{ adminutil__device_keycount|int }}"
   role_to_run:
     - decrypt.yml
     - copy-to-helm.yml
@@ -107,7 +107,7 @@ adminutil_keys_values:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__access_keyprefix }}"
     keystart: "{{ adminutil__access_keystart }}"
-    keycount: "{{ adminutil__access_keystart + adminutil__access_keycount - 1 }}"
+    keycount: "{{ adminutil__access_keycount|int }}"
   role_to_run:
     - decrypt.yml
     - copy-to-helm.yml
@@ -116,7 +116,7 @@ adminutil_keys_values:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__desktop_keyprefix }}"
     keystart: "{{ adminutil__desktop_keystart }}"
-    keycount: "{{ adminutil__desktop_keystart + adminutil__desktop_keycount - 1 }}"
+    keycount: "{{ adminutil__desktop_keycount|int }}"
   role_to_run:
     - decrypt.yml
     - copy-to-helm.yml
diff --git a/kubernetes/ansible/roles/helm-deploy/tasks/main.yml b/kubernetes/ansible/roles/helm-deploy/tasks/main.yml
index 0ca459932..9ef163db2 100644
--- a/kubernetes/ansible/roles/helm-deploy/tasks/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/tasks/main.yml
@@ -22,7 +22,7 @@
     private_key_path: "{{ outer_item.0.values_to_pass.basepath }}"
     private_key_prefix: "{{ outer_item.0.values_to_pass.keyprefix }}"
     private_key_sign_start: "{{ outer_item.0.values_to_pass.keystart }}"
-    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '0'  }}"
+    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '1'  }}"
   when: release_name == "adminutils"
   with_subelements:
     - "{{adminutil_keys_values}}"
diff --git a/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml b/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
index 9d7ad2ee9..9a46ad013 100644
--- a/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
+++ b/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
@@ -26,7 +26,7 @@
     private_key_path: "{{ outer_item.0.values_to_pass.basepath }}"
     private_key_prefix: "{{ outer_item.0.values_to_pass.keyprefix }}"
     private_key_sign_start: "{{ outer_item.0.values_to_pass.keystart }}"
-    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '0'  }}"
+    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '1'  }}"
   when: release_name == "learner" or release_name == "lms" or release_name == "groups"
   with_subelements:
     - "{{adminutil_access_values}}"

From 522cf9c2175f4c8554460fbd131b1875fa30377d Mon Sep 17 00:00:00 2001
From: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Date: Wed, 9 Dec 2020 14:31:36 +0530
Subject: [PATCH 062/184] Changing Desktop Device ACLs to correct Standards.
 (#2082)

Changing Desktop Device ACLs to correct Standards.
---
 ansible/roles/kong-api/defaults/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 4a365fed3..c7ff75e75 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -3018,7 +3018,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'desktopAdmin'
+        - 'desktopSuperAdmin'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -3036,7 +3036,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'desktopApp'
+        - 'desktopAdmin'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -3054,7 +3054,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'desktopApp'
+        - 'desktopAdmin'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -5946,4 +5946,4 @@ kong_apis:
         config.hour: "{{ medium_rate_limit_per_hour }}"
         config.limit_by: credential
       - name: request-size-limiting
-        config.allowed_payload_size: "{{ medium_request_size_limit }}"
\ No newline at end of file
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"

From ce12fe97fc3e79003dc7f59c3c3984dcda803608 Mon Sep 17 00:00:00 2001
From: G33tha <geethap240@gmail.com>
Date: Thu, 10 Dec 2020 21:23:45 +0530
Subject: [PATCH 063/184] Create faq-en.json

---
 utils/DesktopFAQ/faq-en.json | 68 ++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 utils/DesktopFAQ/faq-en.json

diff --git a/utils/DesktopFAQ/faq-en.json b/utils/DesktopFAQ/faq-en.json
new file mode 100644
index 000000000..e5b3bbdb6
--- /dev/null
+++ b/utils/DesktopFAQ/faq-en.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "I cannot see my board, medium, class and subject",
+      "description": "Your State does not currently support all boards, mediums, classes and subjects. As soon as your State adds them, you will see it in the list"
+    },
+    {
+      "topic": "I have downloaded content, but I am unable to play it because it says that I need the Internet",
+      "description": "You may have downloaded YouTube content. You can play YouTube content only when you are online. Connect the computer to the Internet try again. "
+    },
+    {
+      "topic": "I need to update my DIKSHA desktop app",
+      "description": "Connect your computer to the Internet and check https://diksha.gov.in/desktop/latest for the latest app version "
+    },
+    {
+      "topic": "I do not have access to a laptop with an Internet connection, but I want to add or update content on the desktop app",
+      "description": "If you have a mobile phone, download the DIKSHA mobile app from the google playstore. \nBrowse for the content in the app. \nDownload the content from the DIKSHA library. \nCopy it on a pendrive or SD card and upload it to the DIKSHA desktop app."
+    },
+    {
+      "topic": "I do not find content for a particular topic, or I find the content irrelevant",
+      "description": "Browse DIKSHA's online library to search for the content. If it is still unavailable, send your feedback about content to the State SCERT"
+    },
+    {
+      "topic": "The app is very slow",
+      "description": "To speed up the app performance, do the following:\n<br>Go to your computer’s system configuration. The minimum configuration should be:\n<ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br>If your computer matches or exceeds this configuration, restart the app.\n<br>After doing this, if it is still slow, go to <b>Task Manager</b>, \nselect all unused background processes and click <b>End Task</b>"
+    },
+    {
+      "topic": "I am unable to copy content to a pendrive",
+      "description": "To copy the content to a pen drive, do the following:\n<ul><li>Go to your computer Settings. Check if the USB drive is write-protected. If it is, disable the protection</li>\n<li>Check if the pen drive has free space. Delete unwanted files from the pendrive</li></ul>"
+    },
+    {
+      "topic": "I had loaded content on my pendrive, but now I see that it is empty",
+      "description": "Your pendrive or computer may be infected with a virus. Check that:\n* You have an anti virus software installed on your machine\n* Your pendrive is write-protected before you plug it into unknown machines"
+    },
+    {
+      "topic": "It takes time to copy content to and from my pendrive",
+      "description": "The time taken to copy depends on the size of the content file. Some large textbooks take time to copy. We recommend that you do not stop the process in between. Doing so may lead to inconsistent files."
+    },
+    {
+      "topic": "My computer does not have any free space because of DIKSHA content",
+      "description": "Delete downloaded content from the My Downloads tab of the app to free up space on your computer"
+    },
+    {
+      "topic": "Unable to install DIKSHA Desktop application on my Ubuntu system",
+      "description": "<p>To install DIKSHA Desktop application on your ubuntu system:</p>\n<p>1) Open your terminal</p>\n<p>2) Run the command cd <location> to change the directory to where the exe file is downloaded. For example, if the exe is saved in the downloads folder, then run the command cd Downloads</p>\n<p>3) Run the command sudo dpkg -i <filename></p>\n<p>On successfully running this command the application is launched </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "characters left",
+    "explainMsg": "Could you explain the problem?",
+    "faqMsg": "Frequently asked questions",
+    "help": "Help",
+    "helpMsg": "Did this answer help you?",
+    "initiateEmailButton": "Initiate email",
+    "knowMoreMsg": "What more would you like to know?",
+    "noMsg": "No",
+    "reportIssue": "Report an issue",
+    "reportIssueMsg": "Report other issue",
+    "resolveMsg": "Look through the list to resolve your issue",
+    "sorryMsg": "Sorry about that!",
+    "submitButton": "Submit",
+    "tellMoreMsg": "Tell us more about the problem you faced",
+    "thanksMsg": "Thank you for your response!",
+    "triggerEmailMsg": "After you add details in the text box and tap the Initiate email button, we will trigger an email on your behalf. You can add further details and/or attach files there.",
+    "typeHere": "Type Here...",
+    "yesMsg": "Yes"
+  }
+}

From f381e09e4c56eee236e3bc0d144856fc87e552ca Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Fri, 11 Dec 2020 12:34:47 +0530
Subject: [PATCH 064/184] feat: adding configs of 3.5 (#2086)

---
 .../Core/jobs/OfflineInstaller/config.xml     |  80 ++++++
 .../Core/jobs/OfflineInstaller/config.xml     | 235 ++++++++++++++++++
 .../Core/jobs/UploadDesktopFaq/config.xml     | 156 ++++++++++++
 .../Core/jobs/UploadPortalLabel/config.xml    | 189 ++++++++++++++
 4 files changed, 660 insertions(+)
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadDesktopFaq/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml

diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
new file mode 100644
index 000000000..8c1f5a557
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
@@ -0,0 +1,80 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.5.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile.desktop</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
new file mode 100644
index 000000000..20b153b78
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
@@ -0,0 +1,235 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>5</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <hudson.plugins.copyartifact.CopyArtifactPermissionProperty plugin="copyartifact@1.43.1">
+      <projectNameList>
+        <string>ArtifactUpload/dev/Core/OfflineInstaller</string>
+      </projectNameList>
+    </hudson.plugins.copyartifact.CopyArtifactPermissionProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/OfflineInstaller</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlineInstaller</projectName>
+          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="release-3.5.0" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlineInstaller</projectName>
+          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>offline_installer_type</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the type of installer you wanted to build&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>windows64bit</string>
+              <string>linux64bit</string>
+              <string>windows32bit</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-1754928650096303</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlineInstaller</projectName>
+          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-1754928651800681</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlineInstaller</projectName>
+          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-1754928653885653</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlineInstaller</projectName>
+          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/OfflineInstaller</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadDesktopFaq/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadDesktopFaq/config.xml
new file mode 100644
index 000000000..69ec6f249
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadDesktopFaq/config.xml
@@ -0,0 +1,156 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>5</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>UploadDesktopFaq</projectName>
+          <projectFullName>Deploy/dev/Core/UploadDesktopFaq</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>UploadDesktopFaq</projectName>
+          <projectFullName>Deploy/dev/Core/UploadDesktopFaq</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>desktop_container</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>public</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>destination_path</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>desktopFAQ/faq-en.json</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>tag</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>upload-desktop-faq</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>src_file_path</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>utils/DesktopFAQ/faq-en.json</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/desktop-faq/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml
new file mode 100644
index 000000000..6c02e23d5
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml
@@ -0,0 +1,189 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>5</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>UploadPortalLabel</projectName>
+          <projectFullName>Deploy/dev/Core/UploadPortalLabel</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>UploadPortalLabel</projectName>
+          <projectFullName>Deploy/dev/Core/UploadPortalLabel</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>desktop_container</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>label</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>destination_path</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>all_labels_ta.json</string>
+              <string>all_labels_bn.json</string>
+              <string>all_labels_en.json</string>
+              <string>all_labels_hi.json</string>
+              <string>all_labels_kn.json</string>
+              <string>all_labels_mr.json</string>
+              <string>all_labels_te.json</string>
+              <string>all_labels_ur.json</string>
+              <string>all_labels_gu.json</string>
+              <string>all_labels_ml.json</string>
+              <string>all_labels_as.json</string>
+              <string>all_labels_or.json</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>src_file_path</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>utils/portal/labels/all_labels_ta.json</string>
+              <string>utils/portal/labels/all_labels_bn.json</string>
+              <string>utils/portal/labels/all_labels_en.json</string>
+              <string>utils/portal/labels/all_labels_hi.json</string>
+              <string>utils/portal/labels/all_labels_kn.json</string>
+              <string>utils/portal/labels/all_labels_mr.json</string>
+              <string>utils/portal/labels/all_labels_te.json</string>
+              <string>utils/portal/labels/all_labels_ur.json</string>
+              <string>utils/portal/labels/all_labels_gu.json</string>
+              <string>utils/portal/labels/all_labels_ml.json</string>
+              <string>utils/portal/labels/all_labels_as.json</string>
+              <string>utils/portal/labels/all_labels_or.json</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>tag</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>upload-label</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects/>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.5.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/desktop-faq/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>

From 2ed36d487b438cb476f3252d3cf712ad303b71c0 Mon Sep 17 00:00:00 2001
From: harishkumar gangula <harish@sanketika.in>
Date: Fri, 11 Dec 2020 12:45:17 +0530
Subject: [PATCH 065/184] Issue #SB-21202 feat: Add all language faqs

---
 utils/DesktopFAQ/faq-as.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-bn.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-en.json |  4 +--
 utils/DesktopFAQ/faq-gu.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-hi.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-kn.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-ml.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-mr.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-or.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-pa.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-ta.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-te.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-ur.json | 68 ++++++++++++++++++++++++++++++++++++
 13 files changed, 818 insertions(+), 2 deletions(-)
 create mode 100644 utils/DesktopFAQ/faq-as.json
 create mode 100644 utils/DesktopFAQ/faq-bn.json
 create mode 100644 utils/DesktopFAQ/faq-gu.json
 create mode 100644 utils/DesktopFAQ/faq-hi.json
 create mode 100644 utils/DesktopFAQ/faq-kn.json
 create mode 100644 utils/DesktopFAQ/faq-ml.json
 create mode 100644 utils/DesktopFAQ/faq-mr.json
 create mode 100644 utils/DesktopFAQ/faq-or.json
 create mode 100644 utils/DesktopFAQ/faq-pa.json
 create mode 100644 utils/DesktopFAQ/faq-ta.json
 create mode 100644 utils/DesktopFAQ/faq-te.json
 create mode 100644 utils/DesktopFAQ/faq-ur.json

diff --git a/utils/DesktopFAQ/faq-as.json b/utils/DesktopFAQ/faq-as.json
new file mode 100644
index 000000000..243f8c5a4
--- /dev/null
+++ b/utils/DesktopFAQ/faq-as.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "মই মোৰ ব'ৰ্ড, মাধ্যম, শ্ৰেণী আৰু বিষয় চাব পৰা নাই",
+      "description": "আপোনাৰ ৰাজ্যই বৰ্তমান সকলো ব’ৰ্ড, মাধ্যম, শ্ৰেণী আৰু বিষয় সমৰ্থন নকৰে। আপোনাৰ ৰাজ্যই এইসমূহ যোগ কৰাৰ লগে লগেই, আপুনি তালিকা খনত এয়া দেখা পাব।"
+    },
+    {
+      "topic": "মই বিষয়বস্তু ডাউনল’ড কৰিলোঁ, কিন্তু মই এয়া চলাব পৰা নাই কাৰণ ইয়াত কোৱা হৈছে যে মোক ইণ্টাৰনেটৰ প্ৰয়োজন ",
+      "description": "আপুনি ইউটিউব কনটেণ্ট নিশ্চয় ডাউনল’ড কৰিলে। ইউটিউব কনটেণ্ট আপুনি কেৱল অনলাইন হৈ থকা অৱস্থাতহে চলাব পাৰিব। কম্পিউটাৰটো ইণ্টাৰনেটৰ সৈতে সংযোগ কৰক আৰু পুনৰ চেষ্টা কৰক।"
+    },
+    {
+      "topic": "মই মোৰ DIKSHA ডেস্কটপ এপটো আপডেট কৰাৰ প্ৰয়োজন হৈছে",
+      "description": "আপোনাৰ কম্পিউটাৰটো ইণ্টাৰনেটৰ সৈতে সংযোগ কৰক আৰু শেহতীয়া এপ সংস্কৰণৰ বাবে https://staging.sunbirded.org/desktop/latest পৰীক্ষা কৰক"
+    },
+    {
+      "topic": "ইণ্টাৰনেট সংযোগ থকা লেপটপৰ সৈতে মোৰ প্ৰৱেশাধিকাৰ নাই, কিন্তু মই ডেস্কটপ এপত বিষয়বস্তু যোগ দিব আৰু আপডেট কৰিব বিচাৰোঁ",
+      "description": "যদি আপোনাৰ এটা ম’বাইল ফোন আছে, তেন্তে গুগল প্লে’ষ্ট’ৰৰ পৰা DIKSHA ম’বাইল এপটো ডাউনল’ড কৰক।\nএপটোত বিষয়বস্তুৰ বাবে ব্ৰাউজ কৰক।\nDIKSHA লাইব্ৰেৰীৰ পৰা বিষয়বস্তু ডাউনল’ড কৰক।\nএয়া এটা পে’নড্ৰাইভ বা SD কাৰ্ডলৈ ক’পি কৰক আৰু ইয়াক DIKSHA ডেস্কটপ এপত আপল’ড কৰক।"
+    },
+    {
+      "topic": "মই এটা বিশেষ বিষয়ৰ বাবে বিষয়বস্তু বিচাৰি পোৱা নাই, নতুবা মই অপ্ৰাসংগিক বিষয়বস্তু বিচাৰি পাইছোঁ",
+      "description": "বিষয়বস্তুৰ সন্ধান কৰিবলৈ DIKSHAৰ অনলাইন লাইব্ৰেৰী ব্ৰাউজ কৰক। তেতিয়াও যদি এয়া উপলব্ধ নোহোৱাকৈ থাকে, তেন্তে বিষয়বস্তু সম্পৰ্কে আপোনাৰ মতামত ৰাজ্যিক SCERTলৈ প্ৰেৰণ কৰক"
+    },
+    {
+      "topic": "এপটো বৰ লেহেমীয়া গতিৰ",
+      "description": "এপটোৰ কাৰ্যকাৰিতা দ্ৰুত কৰিবলৈ, নিম্নোক্তসমূহ কৰক:\n<br>আপোনাৰ কম্পিউটাৰৰ ছিষ্টেম কনফিগাৰেচনলৈ যাওক। ন্যূনতম কনফিগাৰেচন হ’ব লাগে:\n<li>2 GB RAM</li><ul><li>2 GB RAM</li>\n<li>ডুৱেল ক’ৰ প্ৰচেছৰ</li></ul>\n<br>যদিহে আপোনাৰ কম্পিউটাৰ এই কনফিগাৰেচনৰ সৈতে মিলে বা অতিক্ৰম কৰে, এপটো পুনৰ আৰম্ভ কৰক।\n<br>এইটো কৰাৰ পাছত, যদিহে তেতিয়াও ই মন্থৰ হৈ থাকে তেতিয়া <b>Task Manager</b>লৈ যাওক,\nসকলো অব্যৱহৃত বেকগ্ৰাউণ্ড প্ৰক্ৰিয়া বাছনি কৰক আৰু <b>End Task</b>ত ক্লিক কৰক"
+    },
+    {
+      "topic": "মই পে’নড্ৰাইভলৈ বিষয়বস্তু ক’পি কৰিব পৰা নাই",
+      "description": "বিষয়বস্তুটো পে’ন ড্ৰাইভলৈ ক’পি কৰিবলৈ, তলত দিয়াবোৰ কৰক:\n<ul><li>কম্পিউটাৰৰ চেটিংছলৈ যাওক। USB ড্ৰাইভটো ৰাইট কৰাৰ বাবে সুৰক্ষিত হয়নে নহয় পৰীক্ষা কৰক। যদিহে হয়, সুৰক্ষা নিষ্ক্ৰিয় কৰক </li>\n<li>পে’ন ড্ৰাইভটোত খালি ঠাই আছেনে নাই পৰীক্ষা কৰক। পে’ন ড্ৰাইভটোৰ পৰা অদৰকাৰী ফাইলবোৰ ডিলিট কৰক</li></ul>"
+    },
+    {
+      "topic": "মই পে’নড্ৰাইভত বিষয়বস্তু ভৰালোঁ, কিন্তু এতিয়া মই দেখিছোঁ যে এইটো খালি হৈ আছে",
+      "description": "আপোনাৰ পে’ন ড্ৰাইভ বা কম্পিউটাৰ ভাইৰাছৰদ্বাৰা আক্ৰান্ত হ’ব পাৰে। এয়া পৰীক্ষা কৰক:\n* আপোনাৰ মেচিনত এটা এণ্টি ভাইৰাছ ছফটৱেৰ ইনষ্টল হৈ আছে\n* অচিনাকী মেচিনত আপুনি সংযুক্ত কৰাৰ আগতে আপোনাৰ পে’নড্ৰাইভটো ৰাইট কৰাৰ বাবে সুৰক্ষিত হ’ব লাগিব"
+    },
+    {
+      "topic": "মোৰ পে’নড্ৰাইভলৈ বা পে’নড্ৰাইভৰ পৰা বিষয়বস্তু ক’পি কৰোঁতে সময় লাগে",
+      "description": "ক’পি কৰিবলৈ লগা সময় বিষয়বস্তুটোৰ ফাইলৰ আকাৰৰ ওপৰত নিৰ্ভৰ কৰে। কিছুমান বৃহৎ আকাৰৰ পাঠ্যপুথি ক’পি কৰোঁতে সময় লাগে। আমি পৰামৰ্শ দিও যে আপুনি প্ৰক্ৰিয়াটো মাজতে বন্ধ কৰি নিদিব। এনে কৰাৰ ফলত ফাইলবোৰ সংগতিহীন হৈ পৰিব। "
+    },
+    {
+      "topic": "DIKSHAৰ বিষয়বস্তুৰ বাবে মোৰ কম্পিউটাৰত কোনো খালি ঠাই নাই",
+      "description": "আপোনাৰ কম্পিউটাৰত ঠাই খালি কৰিবলৈ এপটোৰ মাই ডাউনল’ডছ্ টেবটোৰ পৰা ডাউনল’ড হৈ থকা বিষয়বস্তু ডিলিট কৰক"
+    },
+    {
+      "topic": "মোৰ উবান্তু ছিষ্টেমত DIKSHA ডেস্কটপ এপ্লিকেশ্বন ইনষ্টল কৰিব পৰা নাই",
+      "description": "<p>আপোনাৰ উবান্তু ছিষ্টেমত DIKSHA ডেস্কটপ এপ্লিকেশ্বন ইনষ্টল কৰিবলৈ:</p>\n<p>1) আপোনাৰ টাৰ্মিনেল খোলক</p>\n<p>2) exe ফাইলটো য’ত ডাউনল’ড হৈছে তাত নামপঞ্জী সলনি কৰিবলৈ cd <location> নিৰ্দেশটো চলাওক। উদাহৰণস্বৰূপে, যদি exe ডাউনল’ড ফ’ল্ডাৰত ছে’ভ হৈ আছে, তেন্তে cd Downloads নিৰ্দেশটো চলাওক</p>\n<p>3) sudo dpkg -i <filename> নিৰ্দেশটো চলাওক</p>\n<p>এই নিৰ্দেশটো সফলতাৰে চলালে এপ্লিকেশ্বনটো আৰম্ভ হয়</p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "থাকি যোৱা আখৰসমূহ",
+    "explainMsg": "অসুবিধাটো বৰ্ণনা কৰিব পাৰিবনে ?",
+    "faqMsg": "সঘনাই সোধা প্ৰশ্নসমূহ",
+    "help": "সহায়",
+    "helpMsg": "এই উত্তৰটোৱে আপোনাক সহায় কৰিলেনে ?",
+    "initiateEmailButton": "ইমেইল আৰম্ভ কৰক",
+    "knowMoreMsg": "আপুনি আৰু কিবা জানিব খুজিছে?",
+    "noMsg": "নহয়",
+    "reportIssue": "সমস্যা এটা উত্থাপন কৰক",
+    "reportIssueMsg": "অন্য এটা সমস্যা উত্থাপন কৰক",
+    "resolveMsg": "আপোনাৰ অসুবিধাটো সমাধান কৰিবলৈ তালিকাখন চাওক",
+    "sorryMsg": "সেইটোৰ বাবে দুঃখিত!",
+    "submitButton": "প্ৰদান কৰক",
+    "tellMoreMsg": "আপুনি সন্মুখীন হোৱা অসুবিধাটোৰ বিষয়ে আমাক অলপ বেছিকৈ জনাওক",
+    "thanksMsg": "আপোনাৰ সঁহাৰিৰ বাবে ধন্যবাদ !",
+    "triggerEmailMsg": "আপুনি টেক্সট্ বক্সত সবিশেষ যোগ দিয়া আৰু ইমেইল যোগাযোগৰ সুচনা আৰম্ভ কৰা বাটনত টিপাৰ পাছত, আমি আপোনাৰ হৈ এখন ইমেইল পঠাম। আপুনি তাত অধিক সবিশেষ যোগ দিব আৰু / বা ফাইল সংলগ্ন কৰিব পাৰিব।",
+    "typeHere": "ইয়াত লিখক...",
+    "yesMsg": "হয়"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-bn.json b/utils/DesktopFAQ/faq-bn.json
new file mode 100644
index 000000000..9bf1afd2e
--- /dev/null
+++ b/utils/DesktopFAQ/faq-bn.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "আমি আমার বোর্ড, মিডিয়াম বা মাধ্যম, ক্লাস ও বিষয় দেখতে পাচ্ছি না",
+      "description": "আপনার রাজ্য বর্তমানে সবধরনের বোর্ড, মিডিয়াম, ক্লাস ও বিষয়গুলি পড়ানোর সুযোগ প্রদান করছে না। যত তাড়াতাড়ি আপনার রাজ্য সেগুলি অন্তর্ভুক্ত করবে সেই অনুযায়ী আপনি সেগুলি তালিকায় দেখতে পাবেন।"
+    },
+    {
+      "topic": "আমি বিষয়বস্তুটি ডাউনলোড করেছি, কিন্তু আমি এটি চালু করতে পারছি না কারণ এখানে বলা হচ্ছে আমার ইন্টারনেট সংযোগ থাকা প্রয়োজন",
+      "description": "আপনি YouTube-এর বিষয়বস্তু ডাউনলোড করে থাকতে পারেন। শুধুমাত্র অনলাইন থাকার সময় আপনি YouTube-এর বিষয়বস্তু চালাতে পারবেন। আপনার কম্পিউটারটি ইন্টারনেটের সাথে যুক্ত করে আবার চেষ্টা করুন।"
+    },
+    {
+      "topic": "আমার DIKSHA ডেস্কটপ অ্যাপটি আপডেট করা প্রয়োজন",
+      "description": "আপনার কম্পিউটারটি ইন্টারনেটের সঙ্গে যুক্ত করুন ও সাম্প্রতিকতম অ্যাপ সংস্করণটির জন্য https://staging.sunbirded.org/desktop/latest চেক করুন"
+    },
+    {
+      "topic": "ইন্টারনেট সংযোগ সহ কোনও ল্যাপটপে আমার অ্যাকসেস নেই, কিন্তু আমার ডেস্কটপ অ্যাপে আমি বিষয়বস্তু যোগ করতে বা আপডেট করতে চাই",
+      "description": "যদি আপনার কোনো মোবাইল ফোন থাকে তবে DIKSHA মোবাইল অ্যাপটি google playstore থেকে ডাউনলোড করুন।\nঅ্যাপটির মধ্যে বিষয়বস্তুটি ব্রাউজ করুন।\nবিষয়বস্তুটি DIKSHA লাইব্রেরী থেকে ডাউনলোড করুন।\nএটিকে কোনও পেনড্রাইভ বা SD কার্ডে কপি করুন ও DIKSHA ডেস্কটপ অ্যাপে সেটি আপলোড করুন।"
+    },
+    {
+      "topic": "আমি একটি নির্দিষ্ট প্রসঙ্গের ওপর বিষয়বস্তু খুঁজে পাচ্ছি না, অথবা আমি দেখছি বিষয়বস্তুটি অপ্রাসঙ্গিক",
+      "description": "নির্দিষ্ট বিষয়বস্তু খুঁজে পেতে DIKSHA-এর অনলাইন লাইব্রেরীতে ব্রাউজ করুন। যদি তারপরেও আপনি খুঁজে না পান তবে বিষয়বস্তু সম্পর্কে আপনার ফিডব্যাক বা প্রতিক্রিয়া রাজ্য SCERT-এর কাছে পাঠান"
+    },
+    {
+      "topic": "এই অ্যাপটি খুবই ধীরে কাজ করে",
+      "description": "অ্যাপটির কার্যক্ষমতার গতি বৃদ্ধি করতে, নিম্নলিখিত পদ্ধতিটি অনুসরণ করুন:\n<br>আপনার কম্পিউটারের সিস্টেম কনফিগারেশনে যান। নূন্যতম কনফিগারেশন হওয়া প্রয়োজন:\n<ul><li>2 GB RAM</li>\n<li>ডুয়েল কোর প্রসেসর</li></ul>\n<br>যদি আপনার কম্পিউটারে এই বা এর থেকে উন্নত কনফিগারেশন থাকে তবে অ্যাপটি রিস্টার্ট করুন।\n<br>এটি করার পরেও, যদি অ্যাপটি ধীরে কাজ করে তবে <b>টাস্ক ম্যানেজারে</b> যান, সব অব্যবহৃত ব্যাকগ্রাউন্ড প্রসেসগুলি নির্বাচন করুন ও <b>এন্ড টাস্কে</b> ক্লিক করুন"
+    },
+    {
+      "topic": "আমি একটি পেনড্রাইভে বিষয়বস্তু কপি করতে পারছি না",
+      "description": "একটি পেন ড্রাইভে কোনও বিষয়বস্তু কপি করার জন্য নিম্নলিখিত পদ্ধতিটি অনুসরণ করুন:\n<ul><li>আপনার কম্পিউটার সেটিংসে যান। USB ড্রাইভটি রাইট-প্রোটেক্টেড কিনা সেটি চেক করুন। যদি রাইট-প্রোটেক্টেড হয়, প্রোটেকশনটি নিষ্ক্রিয় করুন</li>\n<li>পেন ড্রাইভটিতে খালি জায়গা আছে কিনা তা চেক করুন। পেন ড্রাইভ থেকে অপ্রয়োজনীয় ফাইলগুলি ডিলিট করুন</li></ul>"
+    },
+    {
+      "topic": "আমার পেনড্রাইভে আমি বিষয়বস্তু লোড করেছিলাম, কিন্তু এখন দেখছি সেটি খালি",
+      "description": "আপনার কম্পিউটার বা পেনড্রাইভটিতে ভাইরাস থাকতে পারে, চেক করুন যে:\n\n*আপনার কম্পিউটারে কোনও অ্যান্টি ভাইরাস সফ্টওয়্যার ইনস্টল করা আছে কিনা\n*কোনও অজানা কম্পিউটারে লাগানোর আগে আপনার পেনড্রাইভটি রাইট-প্রোটেক্টেড করা আছে কিনা"
+    },
+    {
+      "topic": "আমার পেনড্রাইভ থেকে ও সেটিতে বিষয়বস্তু কপি হতে সময় লাগছে",
+      "description": "ফাইলটির আকারের ওপর নির্ভর করে যে ফাইলটি কপি হতে কত সময় লাগবে। বড় টেক্সটবুকগুলি কপি হতে বেশি সময় লাগে। আমরা সুপারিশ করব প্রক্রিয়াটি চলাকালীন মাঝপথে সেটি বন্ধ করবেন না। সেটি করলে কপি হওয়া ফাইলটিতে ত্রুটি থেকে যেতে পারে।"
+    },
+    {
+      "topic": "DIKSHA-এর বিষয়বস্তু রাখার কারণে আমার কম্পিউটারে খালি জায়গা নেই।",
+      "description": "ডাউনলোড করা বিষয়বস্তু অ্যাপটির মাই ডাউনলোড ট্যাব থেকে ডিলিট করে আপনার কম্পিউটারে জায়গা খালি করুন।"
+    },
+    {
+      "topic": "আমার উবানটু সিস্টেমে DIKSHA ডেস্কটপ অ্যাপটি ইনস্টল করা যাচ্ছে না",
+      "description": "<p>আপনার উবান্টু সিস্টেমে DIKSHA ডেস্কটপ অ্যাপ্লিকেশন ইনস্টল করতে:</p>\n<p>1) আপনার টার্মিনালটি খুলুন</p>\n<p>2) যেখানে এক্সটেনসন ফাইলটি ডাউনলোড করা হয়েছে সেখানে ডিরেক্টরিটি পরিবর্তন করতে কম্যান্ডটি cd <location> টাইপ করে চালু করুন। উদাহরণস্বরূপ, যদি এক্সটেনসন ফাইলটি ডাউনলোড ফোল্ডারে সংরক্ষণ করা থাকে, তবে কম্যান্ডটি cd Download টাইপ করে চালু করুন</p>\n<p>3) sudo dpkg -i <filename> টাইপ করে কম্যান্ডটি চালু করুন</p>\n<p>এই কম্যান্ডটি সফলভাবে চালু হওয়াতে অ্যাপ্লিকেশনটি চালু হয়েছে </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "অক্ষর বাকি",
+    "explainMsg": "আপনি কি সমস্যা টি ব্যাখ্যা করতে পারবেন?",
+    "faqMsg": "সচরাচর জিজ্ঞাস্য",
+    "help": "সাহায্য ",
+    "helpMsg": "এই উত্তরটি আপনাকে সাহায্য করেছিল?",
+    "initiateEmailButton": "ইমেইল পাঠান\n",
+    "knowMoreMsg": "আপনি আর কি জানতে চান?",
+    "noMsg": "না",
+    "reportIssue": "সমস্যা রিপোর্ট করুন",
+    "reportIssueMsg": "অন্যান্য সমস্যা গুলি রিপোর্ট করুন",
+    "resolveMsg": "আপনার সমস্যা সমাধানের জন্য তালিকা টি দেখুন",
+    "sorryMsg": "এর জন্যে দুঃখিত!",
+    "submitButton": "জমা দিন",
+    "tellMoreMsg": "আপনি যে সমস্যার সম্মুখীন হয়েছেন তার সম্পর্কে আমাদের আরো বলুন",
+    "thanksMsg": "আপনার প্রতিক্রিয়ার জন্য ধন্যবাদ!",
+    "triggerEmailMsg": "আপনি টেক্সট বাক্সে বিশদ যুক্ত করার পরে, ইনিশিয়েটিভ ইমেল বোতামটি তে ক্লিক করুন, আমরা আপনার হয়ে একটি ইমেল ট্রিগার করব। আপনি আরও বিস্তারিত যোগ করতে পারেন এবং/ অথবা সংযুক্ত ফাইল যোগ করতে পারেন",
+    "typeHere": "এখানে লিখুন...",
+    "yesMsg": "হ্যাঁ "
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-en.json b/utils/DesktopFAQ/faq-en.json
index e5b3bbdb6..413c849e6 100644
--- a/utils/DesktopFAQ/faq-en.json
+++ b/utils/DesktopFAQ/faq-en.json
@@ -10,7 +10,7 @@
     },
     {
       "topic": "I need to update my DIKSHA desktop app",
-      "description": "Connect your computer to the Internet and check https://diksha.gov.in/desktop/latest for the latest app version "
+      "description": "Connect your computer to the Internet and check https://staging.sunbirded.org/desktop/latest for the latest app version "
     },
     {
       "topic": "I do not have access to a laptop with an Internet connection, but I want to add or update content on the desktop app",
@@ -65,4 +65,4 @@
     "typeHere": "Type Here...",
     "yesMsg": "Yes"
   }
-}
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-gu.json b/utils/DesktopFAQ/faq-gu.json
new file mode 100644
index 000000000..9410f95a4
--- /dev/null
+++ b/utils/DesktopFAQ/faq-gu.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "હું મારું બોર્ડ, માધ્યમ, વર્ગ અને વિષય જોઈ શકતો નથી",
+      "description": "તમારું રાજ્ય હાલમાં બધા બોર્ડ, માધ્યમો, વર્ગો અને વિષયોને સપોર્ટ કરતું નથી. જલદી તમારું રાજ્ય તેમને ઉમેરશે, તમે તેને સૂચિમાં જોશો"
+    },
+    {
+      "topic": "મેં કન્ટેન્ટ ડાઉનલોડ કરું છે, પરંતુ હું તે ચલાવવામાં અસમર્થ છું કારણ કે તે કહે છે કે મને ઇન્ટરનેટની જરૂર છે",
+      "description": "તમે યુટ્યુબ કન્ટેન્ટ ડાઉનલોડ કરી હશે. તમે ઓનલાઇન હોવ ત્યારે જ તમે યુટ્યુબ સામગ્રી ચલાવી શકો છો. કમ્પ્યુટરને ઇન્ટરનેટથી કનેક્ટ કરો ફરીથી પ્રયાસ કરો."
+    },
+    {
+      "topic": "મારે મારી DIKSHA ડેસ્કટોપ એપ્લિકેશનને અપડેટ કરવાની જરૂર છે",
+      "description": "તમારા કમ્પ્યુટરને ઇન્ટરનેટથી કનેક્ટ કરો અને નવીનતમ એપ્લિકેશન સંસ્કરણ માટે https://staging.sunbirded.org/desktop/latest તપાસો.\n"
+    },
+    {
+      "topic": "મને ઇન્ટરનેટ કનેક્શનવાળા લેપટોપની ઍક્સેસ નથી, પરંતુ હું ડેસ્કટોપ એપ્લિકેશન પર સામગ્રી ઉમેરવા અથવા અપડેટ કરવા માંગું છું",
+      "description": "જો તમારી પાસે મોબાઈલ ફોન છે, તો ગૂગલ પ્લે સ્ટોર પરથી DIKSHA મોબાઇલ એપ્લિકેશન ડાઉનલોડ કરો. એપ્લિકેશનમાંની સામગ્રી માટે બ્રાઉઝ કરો. DIKSHA લાઇબ્રેરીમાંથી સામગ્રી ડાઉનલોડ કરો. તેને પેનડ્રાઇવ અથવા એસડી કાર્ડ પર કોપી કરો અને તેને DIKSHA ડેસ્કટોપ એપ્લિકેશન પર અપલોડ કરો."
+    },
+    {
+      "topic": "મને કોઈ ખાસ વિષય માટે સામગ્રી મળી નથી, અથવા મને સામગ્રી અપ્રસ્તુત લાગે છે\n",
+      "description": "કન્ટેન્ટ શોધવા માટે DIKSHAની ઓનલાઇન લાઇબ્રેરી બ્રાઉઝ કરો. જો તે હજી અનુપલબ્ધ છે, તો કન્ટેન્ટ વિશેનો પ્રતિસાદ રાજ્ય SCERTને મોકલો"
+    },
+    {
+      "topic": "એપ્લિકેશન ખૂબ ધીમી છે",
+      "description": "એપ્લિકેશન પ્રદર્શનને ઝડપી બનાવવા માટે, નીચે આપેલા કાર્યો કરો: <br> તમારા કમ્પ્યુટરની સિસ્ટમ ગોઠવણી પર જાઓ. લઘુત્તમ ગોઠવણી આ હોવી જોઈએ: \n<ul>\n <li> 2 જીબી રેમ </li>\n <li> ડ્યુઅલ કોર પ્રોસેસર </li>\n </ul> \n<br> જો તમારું કમ્પ્યુટર આ ગોઠવણીથી મેળ ખાય છે અથવા ઓળંગાઈ ગયું છે, તો એપ્લિકેશનને ફરીથી પ્રારંભ કરો. \n<br> આ કર્યા પછી, જો તે હજી ધીમું છે, તો <b> ટાસ્ક મેનેજર </b> પર જાઓ, બધી ન વપરાયેલી પૃષ્ઠભૂમિ પ્રક્રિયાઓ પસંદ કરો અને <b> કાર્ય સમાપ્ત કરો </b> ક્લિક કરો."
+    },
+    {
+      "topic": "હું પેનડ્રાઇવ પર કન્ટેન્ટની કોપી કરવામાં અસમર્થ છું",
+      "description": "પેન ડ્રાઇવ પરની સામગ્રીની કોપી કરવા માટે, નીચેની વિગતો કરો: \n<ul>\n <li> તમારા કમ્પ્યુટર સેટિંગ્સ પર જાઓ. યુએસબી ડ્રાઇવ લખવા સુરક્ષિત છે કે કેમ તે તપાસો. જો તે છે, તો સુરક્ષાને બંધ કરો </li> \n<li> પેન ડ્રાઇવમાં ખાલી જગ્યા છે કે કેમ તે તપાસો. પેનડ્રાઈવેમાં જે ફાઇલો જરૂરી નથી તેને કાઢી નાખો </li> \n</ul>"
+    },
+    {
+      "topic": "મારી પેનડ્રાઈવ પર મેં કન્ટેન્ટ લોડ કરી હતી, પરંતુ હવે હું જોઉં છું કે તે ખાલી છે",
+      "description": "તમારું પેનડ્રાઇવ અથવા કમ્પ્યુટર વાયરસથી ચેપ લાગ્યું છે. તે તપાસો:\n * તમારી પાસે તમારા મશીન પર એન્ટી વાયરસ સોફ્ટવેર ઇન્સ્ટોલ કરેલું છે .\n* તમારા પેનડ્રાઇવને તમે અજાણ્યા મશીનોમાં પ્લગ કરતાં પહેલાં તે લખાણ સુરક્ષિત છે."
+    },
+    {
+      "topic": "મારા પેનડ્રાઇવ પર અને તેની કન્ટેન્ટની કોપી કરવામાં સમય લાગે છે",
+      "description": "કોપી કરવા માટે લેવાયેલ સમય સામગ્રી ફાઇલના કદ પર આધારિત છે. કેટલાક મોટા પાઠયપુસ્તકોની કોપી કરવામાં સમય લે છે. અમે ભલામણ કરીએ છીએ કે તમે પ્રક્રિયા વચ્ચે ન રોકો. આમ કરવાથી અસંગત ફાઇલો થઈ શકે છે."
+    },
+    {
+      "topic": "DIKSHA સામગ્રીને કારણે મારા કમ્પ્યુટર પાસે કોઈ ખાલી જગ્યા નથી",
+      "description": "તમારા કમ્પ્યુટર પર જગ્યા ખાલી કરવા માટે એપ્લિકેશનના મારા ડાઉનલોડ ટેબ પરથી ડાઉનલોડ કરેલી સામગ્રી ડીલીટ નાખો"
+    },
+    {
+      "topic": "મારી ઉબુન્ટુ સિસ્ટમ પર DIKSHA ડેસ્કટોપ એપ્લિકેશન ઇન્સ્ટોલ કરવામાં અસમર્થ",
+      "description": "<p> તમારી ઉબુન્ટુ સિસ્ટમ પર DIKSHA ડેસ્કટોપ એપ્લિકેશનને ઇન્સ્ટોલ કરવા માટે: </p> \n<p> 1) તમારું ટર્મિનલ ખોલો </p>\n <p> 2) ડિરેક્ટરીને બદલવા માટે cd <location> આદેશ ચલાવો જ્યાં એક્સેપ્ ફાઇલ ડાઉનલોડ થયેલ છે. ઉદાહરણ તરીકે, જો એક્સેલ ડાઉનલોડ્સ ફોલ્ડરમાં સાચવવામાં આવે છે, તો પછી સીડી ડાઉનલોડ્સ આદેશ ચલાવો </p> \n<p> 3) sudo dpkg -i <filename></p> \n<p> આ આદેશ સફળતાપૂર્વક ચલાવવા પર એપ્લિકેશન શરૂ થઈ છે </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "અક્ષરો બાકી છે.",
+    "explainMsg": "શું તમે સમસ્યા સમજાવી શકો છો?",
+    "faqMsg": "વારંવાર પૂછાતા પ્રશ્નો",
+    "help": "મદદ કરો",
+    "helpMsg": "શું આ જવાબ તમને મદદ કરશે?",
+    "initiateEmailButton": "ઇમેઇલ શરૂ કરો",
+    "knowMoreMsg": " શું તમે વધુ માહિતી જાણવા માંગો છો?",
+    "noMsg": "ના",
+    "reportIssue": "સમસ્યાની જાણ કરો.",
+    "reportIssueMsg": "અન્ય સમસ્યાની જાણ કરો.",
+    "resolveMsg": "તમારી સમસ્યાનું નિરાકરણ લાવવા યાદી જુઓ",
+    "sorryMsg": "તે વિશે માફ કરશો!",
+    "submitButton": "સબમિટ કરો",
+    "tellMoreMsg": "તમે જે સમસ્યાનો સામનો કર્યો હતો તેના વિશે અમને વધુ કહો",
+    "thanksMsg": "તમારી પ્રતિક્રિયા બદલ આભાર!",
+    "triggerEmailMsg": "તમે ટેક્સ્ટ બોક્સમાં વિગતો ઉમેરો અને ઇનિશિએટ ઇ-મેઇલ બટન પર ટેપ કરો પછી, અમે તમારા વતી એક ઇ-મેઇલ ટ્રિગર કરીશું. તમે ત્યાં વધુ વિગતો ઉમેરી શકો છો અને / અથવા ફાઇલો જોડી શકો છો.",
+    "typeHere": "અહી લખો...",
+    "yesMsg": "હા"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-hi.json b/utils/DesktopFAQ/faq-hi.json
new file mode 100644
index 000000000..9736c8cfc
--- /dev/null
+++ b/utils/DesktopFAQ/faq-hi.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "मैं अपना बोर्ड, माध्यम, कक्षा और विषय नहीं देख सकता",
+      "description": "आपका राज्य वर्तमान में सभी बोर्डों, माध्यमों, कक्षाओं और विषयों का समर्थन नहीं करता है । जैसे ही आपका राज्य उन्हें जोड़ता है, आप इसे सूची में देखेंगे"
+    },
+    {
+      "topic": "मैंने कंटेन्ट डाउनलोड की है, लेकिन मैं इसे खोलने में असमर्थ हूं क्योंकि यह कहता है कि मुझे इंटरनेट की आवश्यकता है",
+      "description": "हो सकता है आपने YouTube कंटेन्ट डाउनलोड कर ली होगी। आप YouTube कंटेन्ट तभी तक खोल सकते हैं जब आप ऑनलाइन हों। कंप्यूटर को फिर से इंटरनेट से कनेक्ट करने का प्रयास करें।"
+    },
+    {
+      "topic": "मुझे अपने दीक्षा डेस्कटॉप ऐप को अपडेट करने की आवश्यकता है",
+      "description": "अपने कंप्यूटर को इंटरनेट से कनेक्ट करें और नवीनतम ऐप संस्करण के लिए https://staging.sunbirded.org/desktop/latest देखें"
+    },
+    {
+      "topic": "मेरे पास इंटरनेट कनेक्शन वाले लैपटॉप का अभिगम नहीं है, लेकिन मैं डेस्कटॉप ऐप पर कंटेन्ट जोड़ना या अपडेट करना चाहता हूं",
+      "description": "अगर आपके पास मोबाइल फोन है तो गूगल प्लेस्टोर से दीक्षा मोबाइल एप डाउनलोड करें।\nऐप में कंटेन्ट के लिए ब्राउज़ करें।\nदीक्षा पुस्तकालय से कंटेन्ट डाउनलोड करें।\nइसे पेनड्राइव या एसडी कार्ड पर कॉपी करें और दीक्षा डेस्कटॉप ऐप पर अपलोड करें।"
+    },
+    {
+      "topic": "मुझे किसी विशेष विषय के लिए कंटेन्ट नहीं मिलती है, या मुझे कंटेन्ट अप्रासंगिक लगती है",
+      "description": "सामग्री की खोज के लिए दीक्षा की ऑनलाइन लाइब्रेरी ब्राउज़ करें। यदि यह अभी भी अनुपलब्ध है, तो सामग्री के बारे में अपनी प्रतिक्रिया राज्य SCERT को भेजें"
+    },
+    {
+      "topic": "ऐप बहुत धीमा है",
+      "description": "ऐप प्रदर्शन को गति देने के लिए, निम्नलिखित करें:\n<br>अपने कंप्यूटर के सिस्टम कॉन्फ़िगरेशन पर जाएं। न्यूनतम विन्यास होना चाहिए:\n<ul><li>2 जीबी रैम</li>\n<li>ड्यूल कोर प्रोसेसर</li></ul>\n<br>यदि आपका कंप्यूटर इस विन्यास से मेल खाता है या उससे अधिक है, तो ऐप को फिर से शुरू करें।\n<br>ऐसा करने के बाद, यदि यह अभी भी धीमा है, तो <b>टास्क मैनेजर</b> पर जाएं,\nसभी अप्रयुक्त पृष्ठभूमि प्रक्रियाओं का चयन करें और <b>एंड टास्क</b> पर क्लिक करें"
+    },
+    {
+      "topic": "मैं पेनड्राइव में कंटेन्ट की प्रतिलिपि बनाने में असमर्थ हूं",
+      "description": "कंटेन्ट को पेन ड्राइव पर कॉपी करने के लिए, निम्नलिखित करें:\n<ul><li>अपने कंप्यूटर सेटिंग पर जाएं। जांच करें कि USB ड्राइव लिखने से संरक्षित है या नहीं। यदि ऐसा है, तो सुरक्षा को अक्षम करें</li>\n<li>चेक करें कि पेन ड्राइव में खाली जगह है या नहीं। पेनड्राइव से अवांछित फ़ाइलों को हटाएं</li></ul>"
+    },
+    {
+      "topic": "मैंने अपने पेनड्राइव पर कंटेन्ट लोड की थी, लेकिन अब मैं देख रहा हूं कि यह खाली है",
+      "description": "आपका पेनड्राइव या कंप्यूटर वायरस से संक्रमित हो सकता है। जाँच करें कि:\n* आपके पास एक एंटी वायरस सॉफ़्टवेयर है जो आपकी मशीन पर स्थापित है\n* अज्ञात मशीनों में आपका पेनड्राइव प्लग करने से पहले लिखनें से सुरक्षित है।"
+    },
+    {
+      "topic": "मेरे पेनड्राइव से और में कंटेन्ट को कॉपी करने में समय लगता है",
+      "description": "कॉपी करने के लिए लिया गया समय कंटेन्ट फ़ाइल के आकार पर निर्भर करता है। कुछ बड़ी पाठ्यपुस्तकों को कॉपी करने में समय लगता है। हमारा सुझाव है कि आप इस प्रक्रिया को बीच में न रोकें। ऐसा करने से असंगत फ़ाइलें बन सकती हैं।"
+    },
+    {
+      "topic": "DIKSHA कंटेन्ट के कारण मेरे कंप्यूटर में खाली जगह नहीं है",
+      "description": "अपने कंप्यूटर पर जगह खाली करने के लिए ऐप के माई डाउनलोड टैब से डाउनलोड की गई कंटेन्ट को हटाएं"
+    },
+    {
+      "topic": "मेरे Ubuntu सिस्टम पर दीक्षा डेस्कटॉप एप्लिकेशन इंस्टॉल करने में असमर्थ",
+      "description": "<p> अपने ubuntu सिस्टम पर DIKSHA डेस्कटॉप एप्लिकेशन इंस्टॉल करने के लिए: </ p>\n<p> 1) अपना टर्मिनल खोलें </p>\n<p> 2) निर्देशिका को बदलने के लिए कमांड सीडी <स्थान> को चलाएँ जहाँ एक्स फ़ाइल है डाउनलोड किया गया है। उदाहरण के लिए, यदि exe डाउनलोड फ़ोल्डर में सहेजा गया है, तो कमांड cd डाउनलोड चलाएं </p>\n<p> 3) कमांड sudo dpkg -i चलाएं <filename> </p>\n<p> सफलतापूर्वक इस कमांड को चलाने पर एप्लिकेशन लॉन्च किया गया है </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "अक्षर बाकी",
+    "explainMsg": "आपकी समस्या हमें विस्तार में बतायें",
+    "faqMsg": "अक्सर पूछे जाने वाले प्रश्न",
+    "help": "सहायता",
+    "helpMsg": "क्या आप इस उत्तर से संतुष्ट हैं?",
+    "initiateEmailButton": "ईमेल भेजें",
+    "knowMoreMsg": "आप कोई और जानकारी चाहते हैं?",
+    "noMsg": "नहीं",
+    "reportIssue": "समस्या रिपोर्ट करें",
+    "reportIssueMsg": "अन्य समस्या रिपोर्ट करें",
+    "resolveMsg": "अपनी समस्या का हल सूची में देखें",
+    "sorryMsg": "क्षमा करें!",
+    "submitButton": "दाख़िल करें",
+    "tellMoreMsg": "आपकी समस्या हमें विस्तार में बतायें",
+    "thanksMsg": "आपकी प्रतिक्रिया के लिए धन्यवाद",
+    "triggerEmailMsg": "आप अपना विवरण भर कर, 'ईमेल आरम्भ करें' का बटन दबायें। हम आपकी ओर से ईमेल ट्रिगर करेंगे| आप इस ईमेल में अधिक विवरण व संलग्न जोड़ सकते है।",
+    "typeHere": "यहाँ टाइप करें...",
+    "yesMsg": "हाँ"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-kn.json b/utils/DesktopFAQ/faq-kn.json
new file mode 100644
index 000000000..1be7171ac
--- /dev/null
+++ b/utils/DesktopFAQ/faq-kn.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "ನನ್ನ ಮಂಡಳಿ, ಮಾಧ್ಯಮ, ತರಗತಿ ಮತ್ತು ವಿಷಯ ಕಾಣುತ್ತಿಲ್ಲ",
+      "description": "ನಿಮ್ಮ ರಾಜ್ಯವು ಸದ್ಯಕ್ಕೆ ಎಲ್ಲ ಮಂಡಳಿಗಳು, ಮಾಧ್ಯಮಗಳು, ತರಗತಿಗಳು ಮತ್ತು ವಿಷಯಗಳನ್ನು ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ. ನಿಮ್ಮ ರಾಜ್ಯವು ಅವುಗಳನ್ನು ಸೇರಿಸಿದ ನಂತರ, ನೀವು ಪಟ್ಟಿಯಲ್ಲಿ ಅವನ್ನು ಕಾಣುತ್ತೀರಿ "
+    },
+    {
+      "topic": "ನಾನು ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿದೆ, ಆದರೆ ಪ್ಲೇ ಮಾಡಲು ಆಗುತ್ತಿಲ್ಲ, ಯಾಕೆಂದರೆ ಅದು ಇಂಟರ್ನೆಟ್ ಬೇಕೆಂದು ಹೇಳುತ್ತಿದೆ",
+      "description": "ನೀವು ಯು ಟ್ಯೂಬ್ ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿರಬಹುದು. ನೀವು ಆನ್ಲೈನ್ ಇದ್ದಾಗ ಮಾತ್ರ ಯು ಟ್ಯೂಬ್ ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಬಹುದು. ಕಂಪ್ಯೂಟರನ್ನು ಇಂಟರ್ನೆಟ್ ಗೆ ಸಂಪರ್ಕಿಸಿ, ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
+    },
+    {
+      "topic": "ನನಗೆ ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಆಪ್ ಅನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಬೇಕಿದೆ",
+      "description": "ನಿಮ್ಮ ಕಂಪ್ಯೂಟರನ್ನು ಇಂಟರ್ನೆಟ್ ಗೆ ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ಇತ್ತೀಚಿನ ಆಪ್ ಆವೃತ್ತಿಗೆ https://staging.sunbirded.org/desktop/latest ಅನ್ನು ಪರೀಕ್ಷಿಸಿ"
+    },
+    {
+      "topic": "ನನಗೆ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ ಇರುವ ಲ್ಯಾಪ್ಟಾಪ್ ಗೆ ಲಭ್ಯತೆ ಇಲ್ಲ, ಆದರೆ ಡೆಸ್ಕ್ ಟಾಪ್ ಆಪ್ ನಲ್ಲಿ ನಾನು ಪಠ್ಯಾಂಶಗಳನ್ನು ಸೇರಿಸಲು ಅಥವಾ ನವೀಕರಿಸಲು ಬಯಸಿದ್ದೇನೆ. ",
+      "description": "ನಿಮ್ಮ ಬಳಿ ಮೊಬೈಲ್ ಫೋನಿದ್ದರೆ, ಗೂಗಲ್ ಪ್ಲೇ ಸ್ಟೋರಿನಿಂದ ದೀಕ್ಷಾ ಮೊಬೈಲ್ ಆಪ್ ಡೌನ್ಲೋಡ್ ಮಾಡಿ.\nಆಪ್ ನಲ್ಲಿ ಪಠ್ಯಾಂಶವನ್ನು ಹುಡುಕಿರಿ. \nದೀಕ್ಷಾ ಗ್ರಂಥಾಲಯದಿಂದ ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ.\nಅದನ್ನು ಪೆನ್ ಡ್ರೈವಿಗೆ ಅಥವಾ ಎಸ್ ಡಿ ಕಾರ್ಡಿಗೆ ಕಾಪಿ ಮಾಡಿ ಮತ್ತು ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಆಪ್ ಗೆ ಅಪ್ಲೋಡ್ ಮಾಡಿ. "
+    },
+    {
+      "topic": "ನನಗೆ ನಿರ್ದಿಷ್ಟವಾದ ಅಧ್ಯಾಯದ ಪಠ್ಯಾಂಶ ಕಾಣುತ್ತಿಲ್ಲ, ಅಥವಾ ಸಂಬಂಧವಿಲ್ಲದ ಪಠ್ಯಾಂಶ ಕಾಣುತ್ತಿದೆ",
+      "description": "ಪಠ್ಯಾಂಶವನ್ನು ಹುಡುಕಲು ದೀಕ್ಷಾದ ಆನ್ಲೈನ್ ಗ್ರಂಥಾಲಯದಲ್ಲಿ ಬ್ರೌಸ್ ಮಾಡಿ. ಆಗಲೂ ಸಿಗದಿದ್ದರೆ, ಪಠ್ಯಾಂಶ ಕುರಿತ ಹಿಮ್ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮ ಡಿ.ಎಸ್.ಇ.ಆರ್.ಟಿ.ಗೆ ಕಳಿಸಿ. "
+    },
+    {
+      "topic": "ಆಪ್ ತುಂಬಾ ನಿಧಾನವಿದೆ",
+      "description": "ಆಪ್ ಕಾರ್ಯಕ್ಷಮತೆಯನ್ನು ವೇಗವಾಗಿಸಲು, ಕೆಳಗಿನಂತೆ ಮಾಡಿ: \n<br>ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಸಿಸ್ಟಮ್ ಕಾನ್ಫಿಗರೇಶನ್ ಗೆ ಹೋಗಿ. ಕನಿಷ್ಟ ಕಾನ್ಫಿಗರೇಶನ್ ಹೀಗಿರಬೇಕು: \n <ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br> ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಕಾನ್ಫಿಗರೇಶನ್ ಗೆ ಹೊಂದುತ್ತಿದ್ದರೆ ಅಥವಾ ಇದಕ್ಕಿಂದ ಹೆಚ್ಚಿನದಿದ್ದರೆ, ಆಪ್ ಅನ್ನು ರಿಸ್ಟಾರ್ಟ್ ಮಾಡಿ. \n<br>ಹೀಗೆ ಮಾಡಿದ ನಂತರವೂ, ನಿಧಾನವಾಗಿದ್ದರೆ, ಇಲ್ಲಿಗೆ ಹೋಗಿ<b>ಟಾಸ್ಕ್ ಮ್ಯಾನೇಜರ್</b>,\nಬಳಕೆಮಾಡದ ಎಲ್ಲ ಬ್ಯಾಕ್ ಗ್ರೌಂಡ್ ಪ್ರಕ್ರಿಯೆಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು ಕ್ಲಿಕ್ ಮಾಡಿ <b>ಎಂಡ್ ಟಾಸ್ಕ್</b>"
+    },
+    {
+      "topic": "ನನಗೆ ಪಠ್ಯಾಂಶವನ್ನು ಪೆನ್ ಡ್ರೈವಿಗೆ ಕಾಪಿ ಮಾಡಲು ಆಗುತ್ತಿಲ್ಲ",
+      "description": "ಪಠ್ಯಾಂಶವನ್ನು ಪೆನ್ ಡ್ರೈವಿಗೆ ಕಾಪಿ ಮಾಡಲು, ಕೆಳಗೆ ಸೂಚಿಸಿರುವಂತೆ ಮಾಡಿ: \n<ul><li>ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಸೆಟ್ಟಿಂಗ್ಸ್ ಗೆ ಹೋಗಿ. ಯುಎಸ್ಬಿ ಡ್ರೈವ್ ರೈಟ್ ಪ್ರೊಟೆಕ್ಟೆಡ್ ಎಂದು ಇದೆಯೇ ನೋಡಿ. ಹಾಗಿದ್ದರೆ, ಪ್ರೊಟೆಕ್ಷನ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</li> \n<li>ಪೆನ್ ಡ್ರೈವಿನಲ್ಲಿ ಖಾಲಿ ಜಾಗವಿದೆಯೇ ನೋಡಿ. ಪೆನ್ ಡ್ರೈವಿನಲ್ಲಿ ಅನಗತ್ಯ ಫೈಲುಗಳನ್ನು ಡಿಲೀಟ್ ಮಾಡಿ</li></ul>"
+    },
+    {
+      "topic": "ನನ್ನ ಪೆನ್ ಡ್ರವಿಗೆ ಪಠ್ಯಾಂಶವನ್ನು ಲೋಡ್ ಮಾಡಿರುವೆ, ಆದರೆ ಈಗ ಅದು ಖಾಲಿಯಾಗಿ ಕಾಣುತ್ತಿದೆ",
+      "description": "ನಿಮ್ಮ ಪೆನ್ ಡ್ರೈವ್ ಅಥವಾ ಕಂಪ್ಯೂಟರ್ ಗೆ ವೈರಸ್ ದಾಳಿಯಾಗಿರಬಹುದು. ಇದನ್ನು ಪರೀಕ್ಷಿಸಿ: \n* ನಿಮ್ಮ ಸಿಸ್ಟಮ್ ನಲ್ಲಿ ಆಂಟಿ ವೈರಸ್ ಸಾಫ್ಟ್ ವೇರ್ ಇನ್ ಸ್ಟಾಲ್ ಆಗಿದೆಯೇ ನೋಡಿ\n* ಅಪರಿಚಿತ ಕಂಪ್ಯೂಟರ್ ಗೆ ನಿಮ್ಮ ಪೆನ್ ಡ್ರೈವ್ ಹಾಕುವ ಮೊದಲು, ಅದು ರೈಟ್-ಪ್ರೊಟೆಕ್ಟೆಡ್ ಆಗಿದೆಯೇ ನೋಡಿ"
+    },
+    {
+      "topic": "ಪಠ್ಯಾಂಶವನ್ನು ನನ್ನ ಪೆನ್ ಡ್ರೈವಿಗೆ ಮತ್ತು ನನ್ನ ಪೆನ್ ಡ್ರೈವಿನಿಂದ ಕಾಪಿ ಮಾಡಲು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ",
+      "description": "ಕಾಪಿ ಮಾಡಲು ತೆಗೆದುಕೊಳ್ಳುವ ಸಮಯವು ಪಠ್ಯಾಂಶ ಫೈಲಿನ ಗಾತ್ರವನ್ನು ಅವಲಂಬಿಸಿರುತ್ತದೆ. ದೊಡ್ಡ ಪಠ್ಯಪುಸ್ತಕಗಳಾದರೆ ಕಾಪಿಯಾಗಲು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತವೆ. ಮಧ್ಯದಲ್ಲಿ ಕಾಪಿ ಪ್ರಕ್ರಿಯೆಯನ್ನು ನಿಲ್ಲಿಸಬೇಡಿ. ಹಾಗೆ ಮಾಡಿದರೆ ಫೈಲುಗಳು ಸರಿಯಾಗಿ ಕಾಪಿಯಾಗುವುದಿಲ್ಲ."
+    },
+    {
+      "topic": "ದೀಕ್ಷಾ ಪಠ್ಯಾಂಶದಿಂದಾಗಿ ನನ್ನ ಕಂಪ್ಯೂಟರಿನಲ್ಲಿ ಖಾಲಿ ಜಾಗ ಉಳಿದಿಲ್ಲ",
+      "description": "ನಿಮ್ಮ ಕಂಪ್ಯೂಟರಿನಲ್ಲಿ ಜಾಗ ಖಾಲಿ ಮಾಡಲು ಆಪ್ ನ ಮೈ ಡೌನ್ಲೋಡ್ಸ್ ಟ್ಯಾಬಿನಿಂದ ಡೌನ್ಲೋಡ್ ಆಗಿರುವ ಪಠ್ಯಾಂಶಗಳನ್ನು ಡಿಲೀಟ್ ಮಾಡಿ"
+    },
+    {
+      "topic": "ನನ್ನ ಉಬಂಟು ಸಿಸ್ಟಮ್ ನಲ್ಲಿ ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪಿಸಲು ಆಗುತ್ತಿಲ್ಲ",
+      "description": "<p>ನಿಮ್ಮ ಉಬಂಟು ಸಿಸ್ಟಮ್ ನಲ್ಲಿ ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಅಪ್ಲಿಕೇಷನ್ ಹಾಕಿಕೊಳ್ಳಲು:<p>\n<p>1) ನಿಮ್ಮ ಟರ್ಮಿನಲ್ ಓಪನ್ ಮಾಡಿ</p> \n<p>2) ಕಮಾಂಡ್ ಸಿಡಿ ರನ್ ಮಾಡಿ <location> exe ಫೈಲ್ ಡೌನ್ಲೋಡ್ ಆಗಿರುವಲ್ಲಿ ಡೈರೆಕ್ಟರಿಯನ್ನು ಬದಲಿಸಲು. ಉದಾಹರಣೆಗೆ, exe ಯು ಡೌನ್ಲೋಡ್ಸ್ ಫೋಲ್ಡರಿನಲ್ಲಿ ಸೇವ್ ಆಗಿದ್ದರೆ, ಆಗ ಕಮಾಂಡ್ ಸಿಡಿ ಡೌನ್ಲೋಡ್ಸ್ ಅನ್ನು ರನ್ ಮಾಡಿ</p>\n<p>3) ಕಮಾಂಡ್ sudo dpkg ರನ್ ಮಾಡಿ -i <filename></p>\n<p>ಈ ಕಮಾಂಡ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ರನ್ ಮಾಡಿದ ನಂತರ, ಅಪ್ಲಿಕೇಶನ್ ಶುರುವಾಗುತ್ತದೆ</p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "ಉಳಿದಿರುವ ಅಕ್ಷರಗಳು",
+    "explainMsg": "ನೀವು ತೊಂದರೆಯನ್ನು ವಿವರಿಸುವಿರಾ?",
+    "faqMsg": "ಪದೇಪದೇ ಕೇಳುವ ಪ್ರಶ್ನೆಗಳು",
+    "help": "ಸಹಾಯ",
+    "helpMsg": "ಈ ಉತ್ತರದಿಂದ ನಿಮಗೆ ಸಹಾಯವಾಯಿತೇ? ",
+    "initiateEmailButton": "ಇಮೇಲ್ ಆರಂಭಿಸಿ ",
+    "knowMoreMsg": "ಇನ್ನೂ ಹೆಚ್ಚಿನದೇನದನ್ನು ತಿಳಿಯಲು ಬಯಸುವಿರಿ? ",
+    "noMsg": "ಇಲ್ಲ",
+    "reportIssue": "ಸಮಸ್ಯೆ ಇದೆಯೆಂದು ವರದಿ ಮಾಡಿ",
+    "reportIssueMsg": "ಬೇರೆ ಸಮಸ್ಯೆ ಬಗ್ಗೆ ವರದಿ ಮಾಡಿ ",
+    "resolveMsg": "ನಿಮ್ಮ ಸಮಸ್ಯೆ ಪರಿಹರಿಸಿಕೊಳ್ಳಲು ಪೂರ್ಣ ಪಟ್ಟಿಯನ್ನು ನೋಡಿ",
+    "sorryMsg": "ಅದಕ್ಕಾಗಿ ವಿಷಾದಿಸುತ್ತೇವೆ!",
+    "submitButton": "ಸಲ್ಲಿಸಿ",
+    "tellMoreMsg": "ನೀವು ಎದುರಿಸಿದ ತೊಂದರೆಯ ಬಗ್ಗೆ ಹೆಚ್ಚಿನ ಮಾಹಿತಿ ಹೇಳಿ. ",
+    "thanksMsg": "ನಿಮ್ಮ ಪ್ರತಿಕ್ರಿಯೆಗೆ ಧನ್ಯವಾದಗಳು!",
+    "triggerEmailMsg": "ನೀವು ಟೆಕ್ಸ್ಟ್ ಬಾಕ್ಸಿನಲ್ಲಿ ವಿವರಗಳನ್ನು ಸೇರಿಸಿದ ನಂತರ, ಇಮೇಲ್ ಆರಂಭಿಸಿ ಬಟನ್ ಅನ್ನು ಒತ್ತಿರಿ, ನಾವು ನಿಮ್ಮ ಪರವಾಗಿ ಇಮೇಲ್ ಶುರು ಮಾಡುತ್ತೇವೆ. ನೀವು ಹೆಚ್ಚಿನ ಮಾಹಿತಿಯನ್ನು /ಅಥವ ಅಲ್ಲಿ ಫೈಲುಗಳನ್ನು ಸೇರಿಸಬಹುದು.",
+    "typeHere": "ಇಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ...",
+    "yesMsg": "ಹೌದು"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-ml.json b/utils/DesktopFAQ/faq-ml.json
new file mode 100644
index 000000000..d0b40c43e
--- /dev/null
+++ b/utils/DesktopFAQ/faq-ml.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "എന്റെ ബോർഡ്, മീഡിയം, ക്ലാസ്, വിഷയം എന്നിവ കാണാൻ എനിക്ക് കഴിയുന്നില്ല ",
+      "description": "നിങ്ങളുടെ സംസ്ഥാനം നിലവിൽ എല്ലാ ബോർഡുകളും മീഡിയങ്ങളും ക്ലാസുകളും വിഷയങ്ങളും പിന്തുണയ്ക്കുന്നില്ല. നിങ്ങളുടെ സംസ്ഥാനം അവരെ ചേർത്താലുടൻ, നിങ്ങൾക്ക് അത് പട്ടികയിൽ കാണാം "
+    },
+    {
+      "topic": "ഞാൻ ഉള്ളടക്കം ഡ download ൺലോഡ് ചെയ്തു, പക്ഷേ എനിക്ക് ഇന്റർനെറ്റ് ആവശ്യമാണെന്ന് പറയുന്നതിനാൽ എനിക്ക് പ്ലേ ചെയ്യാൻ കഴിയില്ല",
+      "description": "നിങ്ങൾ YouTube ഉള്ളടക്കം ഡൗൺലോഡ് ചെയ്തിരിക്കാം. നിങ്ങൾ ഓൺലൈനിൽ ആയിരിക്കുമ്പോൾ മാത്രമേ നിങ്ങൾക്ക് YouTube ഉള്ളടക്കം പ്ലേ ചെയ്യാൻ കഴിയൂ. കമ്പ്യൂട്ടർ ഇന്റർനെറ്റിലേക്ക് കണക്റ്റു ചെയ്‌തു വീണ്ടും ശ്രമിക്കുക."
+    },
+    {
+      "topic": "എന്റെ DIKSHA ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ അപ്‌ഡേറ്റ് ചെയ്യേണ്ടതുണ്ട്",
+      "description": "നിങ്ങളുടെ കമ്പ്യൂട്ടർ ഇന്റർനെറ്റിലേക്ക് കണക്റ്റുചെയ്‌ത് ഏറ്റവും പുതിയ അപ്ലിക്കേഷൻ പതിപ്പിനായി https://staging.sunbirded.org/desktop/latest പരിശോധിക്കുക"
+    },
+    {
+      "topic": "എനിക്ക് ഇന്റർനെറ്റ് കണക്ഷനുള്ള ഒരു ലാപ്‌ടോപ്പ് ഇല്ല, പക്ഷേ ഡെസ്‌ക്‌ടോപ്പ് അപ്ലിക്കേഷനിൽ ഉള്ളടക്കം ചേർക്കാനോ അപ്‌ഡേറ്റുചെയ്യാനോ ഞാൻ ആഗ്രഹിക്കുന്നു",
+      "description": "നിങ്ങൾക്ക് ഒരു മൊബൈൽ ഫോൺ ഉണ്ടെങ്കിൽ, google പ്ലേസ്റ്റോറിൽ നിന്ന് DIKSHA മൊബൈൽ അപ്ലിക്കേഷൻ ഡൗൺലോഡുചെയ്യുക. അപ്ലിക്കേഷനിലെ ഉള്ളടക്കത്തിനായി ബ്രൗസുചെയ്യുക. DIKSHA ലൈബ്രറിയിൽ നിന്ന് ഉള്ളടക്കം ഡൗൺലോഡുചെയ്യുക.ഒരു പെൻഡ്രൈവ് അല്ലെങ്കിൽ SD കാർഡിൽ പകർത്തി അത് DIKSHA ഡെസ്‌ക്‌ടോപ്പ് അപ്ലിക്കേഷനിൽ അപ്‌ലോഡുചെയ്യുക."
+    },
+    {
+      "topic": "ഒരു പ്രത്യേക വിഷയത്തിൽ എനിക്ക് ഉള്ളടക്കം കണ്ടെത്താൻ കഴിയില്ല, അല്ലെങ്കിൽ എനിക്ക് ലഭിക്കുന്ന ഉള്ളടക്കം അപ്രസക്തമാണ്",
+      "description": "ഉള്ളടക്കത്തിനായി തിരയുന്നതിന് DIKSHA യുടെ ഓൺലൈൻ ലൈബ്രറി ബ്രൗസ് ചെയ്യുക.അവിടെ ലഭ്യമല്ലെങ്കിൽ, ഉള്ളടക്കത്തെക്കുറിച്ചുള്ള നിങ്ങളുടെ ഫീഡ്ബാക്ക് സംസ്ഥാന SCERT ലേക്ക് അയയ്ക്കുക"
+    },
+    {
+      "topic": "അപ്ലിക്കേഷൻ മന്ദഗതിയിലാണ്",
+      "description": "അപ്ലിക്കേഷൻ പ്രകടനം വേഗത്തിലാക്കാൻ,ചുവടെപറയുന്നവ ചെയ്യുക:\n<br>നിങ്ങളുടെ കമ്പ്യൂട്ടറിന്റെ സിസ്റ്റം കോൺഫിഗറേഷനിലേക്ക് പോകുക. ഏറ്റവും കുറഞ്ഞ കോൺഫിഗറേഷൻ ഇതായിരിക്കണം:\n<ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br>നിങ്ങളുടെ കമ്പ്യൂട്ടറിന്റെ കോൺഫിഗറേഷൻ തുല്യമോ അതിൽ കൂടുതലോ ആണെങ്കിൽ, അപ്ലിക്കേഷൻ പുനരാരംഭിക്കുക.\n<br>ഇത് ചെയ്തതിനു ശേഷവും അപ്ലിക്കേഷൻ മന്ദഗതിയിലാണെങ്കിൽ, <b> ടാസ്ക് മാനേജർ </b> ലേക്ക് പോകുക,ഉപയോഗിക്കാത്ത എല്ലാ പശ്ചാത്തല പ്രക്രിയകളും തിരഞ്ഞെടുത്ത് <b> ടാസ്ക് അവസാനിപ്പിക്കുക </b> ക്ലിക്കുചെയ്യുക"
+    },
+    {
+      "topic": " പെൻഡ്രൈവിലേക്ക് ഉള്ളടക്കം പകർത്താൻ എനിക്ക് കഴിയില്ല ",
+      "description": "ഒരു പെൻ ഡ്രൈവിലേക്ക് ഉള്ളടക്കം പകർത്താൻ,ചുവടെപറയുന്നവ ചെയ്യുക:\n<ul><li>നിങ്ങളുടെ കമ്പ്യൂട്ടർ ക്രമീകരണങ്ങളിലേക്ക് പോകുക.USB ഡ്രൈവ് എഴുത്ത് പരിരക്ഷിതമാണോയെന്ന് പരിശോധിക്കുക. അങ്ങനെയാണെങ്കിൽ, പരിരക്ഷണം പ്രവർത്തനരഹിതമാക്കുക</li>\n<li>പെൻഡ്രൈവിൽ ഇടമുണ്ടോയെന്ന് പരിശോധിക്കുക. പെൻഡ്രൈവിൽ നിന്ന് അനാവശ്യ ഫയലുകൾ ഡിലീറ്റ് ചെയ്യുക</li></ul> "
+    },
+    {
+      "topic": "എന്റെ പെൻ‌ഡ്രൈവിൽ ഞാൻ ഉള്ളടക്കം ലോഡുചെയ്തിരുന്നു, പക്ഷേ ഇപ്പോൾ അത് ശൂന്യമായി ഞാൻ കാണുന്നു",
+      "description": "നിങ്ങളുടെ പെൻ ഡ്രൈവ് അല്ലെങ്കിൽ കമ്പ്യൂട്ടർ ഒരു വൈറസ് ബാധിച്ചേക്കാം. പരിശോധിക്കുക:\n* നിങ്ങളുടെ ഉപകരണത്തിൽ ആന്റി വൈറസ് സോഫ്റ്റ്വെയർ ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ടോ \n* അജ്ഞാത ഉപകരണങ്ങളിലേക്ക് കണക്റ്റുചെയ്യുന്നതിന് മുമ്പ് നിങ്ങളുടെ പെൻ ഡ്രൈവ് പുനരാലേഖനം ചെയ്യപ്പെടുന്നുണ്ടോ"
+    },
+    {
+      "topic": "എന്റെ പെൻ ഡ്രൈവിലേക്കും പെൻ ഡ്രൈവിൽ നിന്നോ ഉള്ളടക്കം പകർത്താൻ സമയമെടുക്കും",
+      "description": "പകർത്താൻ എടുക്കുന്ന സമയം ഉള്ളടക്ക ഫയലിന്റെ വലുപ്പത്തെ ആശ്രയിച്ചിരിക്കുന്നു. ചില വലിയ പാഠപുസ്തകങ്ങൾ പകർത്താൻ സമയമെടുക്കും.അതിനിടയിൽ പ്രക്രിയ നിർത്തരുതെന്ന് ഞങ്ങൾ ശുപാർശ ചെയ്യുന്നു. അങ്ങനെ ചെയ്യുന്നത് പൊരുത്തമില്ലാത്ത ഫയലുകളിലേക്ക് നയിച്ചേക്കാം."
+    },
+    {
+      "topic": "DIKSHA ഉള്ളടക്കം കാരണം എന്റെ കമ്പ്യൂട്ടറിൽ ഇടമില്ല",
+      "description": "നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ ഇടം ശൂന്യമാക്കുന്നതിന് അപ്ലിക്കേഷന്റെ എന്റെ ഡൗൺലോഡുകൾ ടാബിൽ നിന്ന് ഡൗൺലോഡുചെയ്‌ത ഉള്ളടക്കം ഡിലീറ്റ് ചെയ്യുക"
+    },
+    {
+      "topic": "എന്റെ ഉബുണ്ടു സിസ്റ്റത്തിൽ DIKSHA ഡെസ്ക്ടോപ്പ് ആപ്ലിക്കേഷൻ ഇൻസ്റ്റാൾ ചെയ്യാൻ കഴിയുന്നില്ല ",
+      "description": "<p> നിങ്ങളുടെ ഉബുണ്ടു സിസ്റ്റത്തിൽ DIKSHA ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ ഇൻസ്റ്റാൾ ചെയ്യുന്നതിന്: </p> <p>1) നിങ്ങളുടെ ടെർമിനൽ തുറക്കുക </p> \n<p> 2)exe ഫയൽ ഡൗൺലോഡ് ‌ചെയ്‌ത സ്ഥലത്തേക്ക് ഡയറക്‌ടറി മാറ്റുന്നതിന് <location>cd കമാൻഡ് പ്രവർത്തിപ്പിക്കുക. ഉദാഹരണത്തിന്, ഡൗൺലോഡ് ഫോൾ‌ഡറിൽ‌ exe സംരക്ഷിച്ചിട്ടുണ്ടെങ്കിൽ‌,കമാൻഡ് cd ഡൗൺലോഡുകൾ പ്രവർത്തിപ്പിക്കുക</p>\n<p>3) sudo dpkg -i കമാൻഡ് പ്രവർത്തിപ്പിക്കുക <filename> </p>\n<p> ഈ കമാൻഡ് വിജയകരമായി പ്രവർത്തിപ്പിക്കുമ്പോൾ അപ്ലിക്കേഷൻ സമാരംഭിച്ചു </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "പ്രതീകങ്ങൾ ശേഷിക്കുന്നു",
+    "explainMsg": "നിങ്ങൾക്ക് പ്രശ്നം വിശദീകരിക്കാമോ?",
+    "faqMsg": "പതിവായി ചോദിക്കുന്ന ചോദ്യങ്ങൾ",
+    "help": "സഹായം",
+    "helpMsg": "ഈ ഉത്തരം നിങ്ങളെ സഹായിച്ചോ?\n",
+    "initiateEmailButton": "ഇമെയിൽ ആരംഭിക്കുക",
+    "knowMoreMsg": "കൂടുതൽ എന്താണ് നിങ്ങൾ അറിയാൻ ആഗ്രഹിക്കുന്നത്?",
+    "noMsg": "ഇല്ല",
+    "reportIssue": "ഒരു പ്രശ്നം റിപ്പോർട്ടുചെയ്യുക",
+    "reportIssueMsg": "മറ്റ് പ്രശ്നം റിപ്പോർട്ട് ചെയ്യുക",
+    "resolveMsg": "നിങ്ങളുടെ പ്രശ്നം പരിഹരിക്കാൻ പട്ടികയിലൂടെ നോക്കുക",
+    "sorryMsg": "ക്ഷമിക്കണം!",
+    "submitButton": "സമർപ്പിക്കുക",
+    "tellMoreMsg": "നിങ്ങൾ നേരിട്ട പ്രശ്നത്തെക്കുറിച്ച് ഞങ്ങളോട് കൂടുതൽ പറയുക",
+    "thanksMsg": "നിങ്ങളുടെ പ്രതികരണത്തിന് നന്ദി!",
+    "triggerEmailMsg": "ടെക്സ്റ്റ് ബോക്സിൽ നിങ്ങൾ വിശദാംശങ്ങൾ ചേർത്ത് ഇമെയിൽ ആരംഭിക്കുക ബട്ടൺ ടാപ്പുചെയ്ത ശേഷം, നിങ്ങളുടെ താൽപ്പര്യാർത്ഥം ഞങ്ങൾ ഒരു ഇമെയിൽ പ്രവർത്തനക്ഷമമാക്കും. നിങ്ങൾക്ക് കൂടുതൽ വിശദാംശങ്ങൾ ചേർക്കാനും അല്ലെങ്കിൽ അവിടെ ഫയലുകൾ അറ്റാച്ചുചെയ്യാനും കഴിയും.",
+    "typeHere": "ഇവിടെ ടൈപ്പ് ചെയ്യുക...",
+    "yesMsg": "അതെ"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-mr.json b/utils/DesktopFAQ/faq-mr.json
new file mode 100644
index 000000000..ba4453fdc
--- /dev/null
+++ b/utils/DesktopFAQ/faq-mr.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "मला माझे बोर्ड, माध्यम, इयत्ता व विषय दिसत नाहीत ",
+      "description": "तुमचे राज्य सध्या सर्व बोर्ड, माध्यमे, इयत्ता व विषयांना समर्थन देत नाही. तुमच्या राज्याने हे जोडताच, तुम्हाला ते यादीत दिसेल."
+    },
+    {
+      "topic": "मी सामग्री डाउनलोड केली आहे, पण 'इंटरनेट आवश्यक आहे' या कारणास्तव मी ती चालवू शकत नाही ",
+      "description": "तुम्ही यूट्यूब वरची सामग्री डाउनलोड केलेली असू शकते. तुम्ही यूट्यूब सामग्री फक्त ऑनलाइन असताना चालवू शकता. कॉम्प्युटर इंटरनेटशी जोडून पुन्हा प्रयत्न करा."
+    },
+    {
+      "topic": "मला माझा DIKSHA डेस्कटॉप ऍप अपडेट करायचा आहे ",
+      "description": "ऍपच्या नवीनतम आवृत्तीसाठी तुमचा कॉम्प्युटर इंटरनेटशी जोडून https://staging.sunbirded.org/desktop/latest तपासा "
+    },
+    {
+      "topic": "माझ्याकडे इंटरनेट कनेक्शन असलेला लॅपटॉप नाही, पण मला डेस्कटॉप ऍपवर सामग्री जोडायची किंवा अपडेट करायची आहे ",
+      "description": "तुमच्याकडे मोबाइल फोन असल्यास, गूगल प्लेस्टोर वरून DIKSHA मोबाइल ऍप डाउनलोड करा.\nऍपवरून सामग्री ब्राउझ करा.\nDIKSHA लायब्ररी मधून सामग्री डाउनलोड करा.\nती पेन ड्राइव्ह किंवा SD कार्ड वर कॉपी करून DIKSHA डेस्कटॉप ऍपवर अपलोड करा."
+    },
+    {
+      "topic": "मला एका विशिष्ट विषयाची सामग्री मिळत नाही, किंवा मिळालेली सामग्री असंबद्ध आहे ",
+      "description": "सामग्री शोधण्यासाठी दीक्षा DIKSHAची ऑनलाइन लायब्ररी ब्राउझ करा. तिथेही सामग्री उपलब्ध नसल्यास, तुमचा सामग्री विषयी अभिप्राय राज्य SCERTकडे पाठवा "
+    },
+    {
+      "topic": "ऍपचा वेग खूप कमी आहे ",
+      "description": "तुमच्या ऍपची कार्यक्षमता वाढवण्यासाठी खालीलप्रमाणे करा:\n<br>तुमच्या कॉम्प्युटरच्या सिस्टिम कॉन्फिगरेशन वर जा. तुमचे किमान कॉन्फिगरेशन असायला हवे: \n<ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br>तुमच्या कॉम्पुटरचे कॉन्फिगरेशन एवढे, किंवा यापेक्षा जास्त असल्यास, ऍप पुन्हा सुरू करा.\n<br>हे करूनही ऍपचा वेग कमी असल्यास <b>कार्य व्यवस्थापक</b> इथे जा,\nवापरात नसलेल्या सर्व पार्श्वभूमी प्रक्रिया सिलेक्ट करा व <b>कार्य संपवा</b> क्लिक करा "
+    },
+    {
+      "topic": "मी सामग्री पेन ड्राइव्ह वर कॉपी करू शकत नाही आहे ",
+      "description": "सामग्री पेन ड्राइव्ह वर कॉपी करण्यासाठी खालीलप्रमाणे करा:\n<li>तुमच्या कॉम्प्युटर सेटिंग्ज वर जा. तुमचा USB ड्राइव्ह लिखाण-प्रतिबंधित आहे का, हे तपासा.असल्यास, प्रतिबंध अक्षम करा</li>\n<li>पेन ड्राइव्ह वर मोकळी जागा आहे का पहा. नको असलेल्या फाइल्स पेन ड्राइव्ह वरून डिलीट करा</li></ul>"
+    },
+    {
+      "topic": "मी माझ्या पेन ड्राइव्ह वर सामग्री लोड केली होती, पण आता ती रिकामी आहे असे दिसते ",
+      "description": "तुमचा पेन ड्राइव्ह किंवा कॉम्पुटर व्हायरसने बाधित झाला असण्याची शक्यता आहे. हे तपासा:\n*तुमच्या यंत्रावर अँटी-व्हायरस सॉफ्टवेअर स्थापित केले आहे का \n*अज्ञात यंत्रांशी जोडण्याआधी तुमची पेन ड्राइव्ह लिखाण-प्रतिबंधित केली आहे का "
+    },
+    {
+      "topic": "माझ्या पेन ड्राइव्हवर, किंवा पेन ड्राइव्ह वरून सामग्री कॉपी करण्यास खूप वेळ लागतो ",
+      "description": "कॉपी करण्यासाठी लागणारा वेळ सामग्रीच्या फाइलच्या आकारमानावर अवलंबून आहे. काही मोठी पाठ्यपुस्तके कॉपी करण्यास वेळ लागतो. कॉपीची प्रक्रिया मध्येच थांबवू नये असा आमचा सल्ला आहे. असे केल्यास फाइल्स मध्ये विसंगती येऊ शकते. "
+    },
+    {
+      "topic": "DIKSHAच्या सामग्रीमुळे माझ्या कॉम्प्युटरवर मोकळी जागा उरली नाही ",
+      "description": "तुमच्या कॉम्प्युटरवर जागा मोकळी करण्यासाठी, ऍपवरील माझे डाउनलोड टॅब वरून डाउनलोड केलेली सामग्री डिलीट करा "
+    },
+    {
+      "topic": "माझ्या उबंटू सिस्टिम वर DIKSHA डेस्कटॉप ऍप स्थापित करण्यास अयशस्वी ",
+      "description": "<p>तुमच्या उबंटू सिस्टिम वर DIKSHA डेस्कटॉप ऍप स्थापित करण्यासाठी:</p>\n<p>१) तुमचे टर्मिनल उघडा</p>\n<p>२) निर्देशिका बदलून exe फाइल जिथे डाउनलोड केलेली आहे तिथे नेण्यासाठी cd <स्थान> ही आज्ञा करा. उदा:, exe डाउनलोड फोल्डर मध्ये सेव्ह केली असल्यास, cd Downloads</p> ही आज्ञा करा \n<p>३) sudo dpkg -i <filename></p> ही आज्ञा करा \n<p>ही आज्ञा यशस्वीरीत्या केल्यानंतर हे ऍप सुरू केले जाईल </p>\n"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "उर्वरित वर्ण ",
+    "explainMsg": "तुम्ही समस्येचे स्पष्टीकरण द्याल का?",
+    "faqMsg": "विचारण्यात येणारे प्रश्न",
+    "help": "सहायता",
+    "helpMsg": "ह्या उत्तराची तुम्हाला मदत झाली का?",
+    "initiateEmailButton": "ईमेल आरंभ करा",
+    "knowMoreMsg": "तुम्हाला आणखीन काही जाणून घ्यायचे आहे का?",
+    "noMsg": "नाही",
+    "reportIssue": "तक्रार दाखल करा",
+    "reportIssueMsg": "इतर तक्रारी दाखल करा",
+    "resolveMsg": "तुमच्या समस्येचे निराकरण करण्यासाठी सूची पहा",
+    "sorryMsg": "क्षमस्व!",
+    "submitButton": "सबमिट करा",
+    "tellMoreMsg": "तुमच्या समस्येबद्दल आम्हाला अधिक सांगा",
+    "thanksMsg": "तुमच्या प्रतिसादासाठी धन्यवाद!",
+    "triggerEmailMsg": "तुम्ही माहिती जोडल्यानंतर आणि 'ईमेल आरंभ करा' बटण टॅप केल्यानंतर, आम्ही तुमच्या वतीने ईमेल ट्रिगर करू. तेथे तुम्ही अधिक माहिती आणि / किंवा फायली संलग्न करू शकता.",
+    "typeHere": "येथे टाईप करा",
+    "yesMsg": "होय"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-or.json b/utils/DesktopFAQ/faq-or.json
new file mode 100644
index 000000000..315ef2437
--- /dev/null
+++ b/utils/DesktopFAQ/faq-or.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "ମୁ ମୋର ବୋର୍ଡ , ମାଧ୍ୟମ, ଶ୍ରେଣୀ ଓ ବିଷୟ ଦେଖିପାରୁନାହିଁ ",
+      "description": "ଆପଣଙ୍କ ରାଜ୍ୟ ବର୍ତ୍ତମାନ ସବୁ ବୋର୍ଡ ,ମାଧ୍ୟମ ,ଶ୍ରେଣୀ ଏବଂ ବିଷୟକୁ ସପୋର୍ଟ କରୁନାହିଁ | ଆପଣଙ୍କ ରାଜ୍ୟ ଏସବୁକୁ ଯୋଡିବା ମାତ୍ରେ, ଆପଣ ତାହାକୁ ଏହି ସୂଚୀରେ ଦେଖିପାରିବେ "
+    },
+    {
+      "topic": "ମୁଁ କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରିଛି, କିନ୍ତୁ ମୁଁ ଏହାକୁ ପ୍ଲେ କରିପାରୁ ନାହିଁ କାରଣ ଇଣ୍ଟରନେଟ୍ ଆବଶ୍ୟକ ବୋଲି ଏହା ଦର୍ଶାଉଛି ",
+      "description": "ଆପଣ YouTube କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରିଥାଇପାରନ୍ତି । କେବଳ ଅନଲାଇନ୍ ଥିବା ସମୟରେ ହିଁ ଆପଣ YouTube କଣ୍ଟେଣ୍ଟ୍ ପ୍ଲେ କରିପାରିବେ । କମ୍ପ୍ୟୁଟରକୁ ଇଣ୍ଟରନେଟ୍ ରେ କନେକ୍ଟ କରନ୍ତୁ ଏବଂ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ ।"
+    },
+    {
+      "topic": "ମୋର DIKSHA ଡେସ୍କଟପ ଆପ୍ ଅପଡେଟ୍ କରିବାର ଅଛି",
+      "description": "ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରକୁ ଇଣ୍ଟରନେଟରେ କନେକ୍ଟ କରନ୍ତୁ, ଏବଂ ସଦ୍ୟତମ ଆପ୍ ଭର୍ସନ୍ ପାଇଁ ଦେଖନ୍ତୁ, https://staging.sunbirded.org/desktop/latest"
+    },
+    {
+      "topic": "ଇଣ୍ଟରନେଟ୍ କନେକ୍ସନ୍ ଥିବା ଲାପଟପ୍ ମୋ ପାଖରେ ନାହିଁ, କିନ୍ତୁ ମୁଁ ଡେସ୍କଟପ୍ ଆପ୍ ରେ ଥିବା କଣ୍ଟେଣ୍ଟ୍ ଯୋଗ କରିବାକୁ କିମ୍ବା ଅପଡେଟ୍ କରିବାକୁ ଚାହୁଁଛି ।",
+      "description": "ଯଦି ଆପଣଙ୍କର ମୋବାଇଲ୍ ଫୋନ୍ ଥାଏ, ତେବେ google playstore ରୁ DIKSHA ମୋବାଇଲ୍ ଆପ୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ ।\nଆପ୍ ରେ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ ।\nDIKSHA ଲାଇବ୍ରେରୀରୁ କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ ।\nଏହାକୁ ପେନଡ୍ରାଇଭ୍ କିମ୍ବା SD କାର୍ଡରେ କପି କରନ୍ତୁ ଏବଂ DIKSHA ଡେସ୍କଟପ୍ ଆପ୍ ରେ ଅପଲୋଡ୍ କରନ୍ତୁ ।"
+    },
+    {
+      "topic": "ଏକ ନିର୍ଦ୍ଦିଷ୍ଟ ବିଷୟରେ ମୁଁ କଣ୍ଟେଣ୍ଟ୍ ପାଉନାହିଁ, ବା ମୋତେ କଣ୍ଟେଣ୍ଟ୍ ଅପ୍ରାସଙ୍ଗିକ ଲାଗୁଛି",
+      "description": "କଣ୍ଟେଣ୍ଟ୍ ସର୍ଚ୍ଚ କରିବା ପାଇଁ, DIKSHA ର ଅନଲାଇନ୍ ଲାଇବ୍ରେରୀ ବ୍ରାଉଜ୍ କରନ୍ତୁ । ତଥାପି ଯଦି ଏହା ଉପଲବ୍ଧ ନଥାଏ, କଣ୍ଟେଣ୍ଟ୍ ସମ୍ବନ୍ଧରେ ଆପଣଙ୍କ ଫିଡବ୍ୟାକ୍ ରାଜ୍ୟ SCERT କୁ ପଠାନ୍ତୁ "
+    },
+    {
+      "topic": "ଏହି ଆପ୍ ବହୁତ ସ୍ଲୋ ଅଟେ",
+      "description": "ଆପ୍ କାର୍ଯ୍ୟକ୍ଷମତାକୁ ଗତିଶୀଳ କରିବା ପାଇଁ, ନିମ୍ନଲିଖିତ କାର୍ଯ୍ୟ କରନ୍ତୁ: \n<br>ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରର ସିଷ୍ଟମ୍ କନଫିଗରେସନ୍ କୁ ଯାଆନ୍ତୁ । ସର୍ବନିମ୍ନ କନଫିଗରେସନ୍ ଏହା ହେବା ଉଚିତ୍:\n<li>2 GB RAM</li>\n<li>ଡୁଆଲ୍ କୋର୍ ପ୍ରୋସେସର</li></ul>\n<br>ଯଦି ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରରେ ଏହି କନଫିଗରେସନ୍ ଅଛି କିମ୍ବା ଏହାଠାରୁ ଅଧିକ ଅଛି, ତେବେ ଆପ୍ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ ।\n<br>ଏହା କରିବା ପରେ ମଧ୍ୟ ଯଦି ସ୍ଲୋ ହୁଏ, ତେବେ ଏଠାକୁ ଯାଆନ୍ତୁ: <b>ଟାସ୍କ ମ୍ୟାନେଜର୍</b>, ସମସ୍ତ ଅବ୍ୟବହୃତ ବ୍ୟାକଗ୍ରାଉଣ୍ଡ ପ୍ରୋସେସ୍ କୁ ସିଲେକ୍ଟ କରନ୍ତୁ ଏବଂ <b>ଏଣ୍ଡ୍ ଟାସ୍କ</b>ରେ କ୍ଲିକ୍ କରନ୍ତୁ "
+    },
+    {
+      "topic": "ମୁଁ ପେନଡ୍ରାଇଭକୁ କଣ୍ଟେଣ୍ଟ୍ କପି କରିବାରେ ବିଫଳ",
+      "description": "କଣ୍ଟେଣ୍ଟକୁ ପେନଡ୍ରାଇଭକୁ କପି କରିବା ପାଇଁ, ନିମ୍ନଲିଖିତ ସୋପାନ ଅନୁସରଣ କରନ୍ତୁ: \n<ul><li>କମ୍ପ୍ୟୁଟର ସେଟିଂସ୍ କୁ ଯାଆନ୍ତୁ । USB ଡ୍ରାଇଭ୍ ରାଇଟ୍-ପ୍ରୋଟେକ୍ଟେଡ୍ କି ନାହିଁ ଯାଞ୍ଚକରନ୍ତୁ । ଯଦି ଏହା ସେପରି ହୋଇଥାଏ, ପ୍ରୋଟେକ୍ସନକୁ ଡିସେବଲ୍ କରନ୍ତୁ</li>\n<li>ପେନଡ୍ରାଇଭରେ ଫ୍ରି ସ୍ପେସ୍ ଅଛି କି ନାହିଁ ଯାଞ୍ଚକରନ୍ତୁ । ପେନଡ୍ରାଇଭରୁ ଅଦରକାରୀ ଫାଇଲ୍ ଡିଲିଟ୍ କରନ୍ତୁ </li></ul>"
+    },
+    {
+      "topic": "ମୁଁ ପେନଡ୍ରାଇଭରେ କଣ୍ଟେଣ୍ଟ୍ ଲୋଡ୍ କରିଛି, କିନ୍ତୁ ଏବେ ଏହା ଖାଲି ଦେଖାଉଛି ",
+      "description": "ଆପଣଙ୍କ ପେନଡ୍ରାଇଭ୍ କିମ୍ବା କମ୍ପ୍ୟୁଟର ଭାଇରସ୍ ଦ୍ୱାରା ପ୍ରଭାବିତ ହୋଇଥାଇପାରେ । ଯାଞ୍ଚକରନ୍ତୁ କି:\n* ଆପଣଙ୍କ ମେସିନ୍ ରେ ଆଣ୍ଟି ଭାଇରସ୍ ସଫ୍ଟୱେର୍ ଇନଷ୍ଟଲ୍ ହୋଇଛି \n* ଅଜଣା ମେସିନ୍ ସହ ପ୍ଲଗ୍ ଇନ୍ କରିବା ପୂର୍ବରୁ ଯାଞ୍ଚକରନ୍ତୁ କି ଆପଣଙ୍କ ପେନଡ୍ରାଇଭ୍ ରାଇଟ୍-ପ୍ରୋଟେକ୍ଟେଡ୍ ଅଛି "
+    },
+    {
+      "topic": "ମୋ ପେନଡ୍ରାଇଭକୁ ଏବଂ ପେନଡ୍ରାଇଭରୁ କଣ୍ଟେଣ୍ଟ୍ କପି କରିବା ପାଇଁ ଅଧିକ ସମୟ ଲାଗୁଛି ",
+      "description": "କପି କରିବାକୁ ଲାଗୁଥିବା ସମୟ କଣ୍ଟେଣ୍ଟ୍ ଫାଇଲର ଆକାର ଉପରେ ନିର୍ଭର କରେ । କିଛି ବୃହତ୍ ପାଠ୍ୟପୁସ୍ତକ କପି ହେବାକୁ ଅଧିକ ସମୟ ଲାଗେ । ଆମେ ସୁପାରିଶ କରୁଛୁ କି ଏହି ପ୍ରକ୍ରିୟା ଚାଲିବା ସମୟରେ ଆପଣ ବନ୍ଦ କରନ୍ତୁ ନାହିଁ । ଏପରି କରିବା ଦ୍ୱାରା ଫାଇଲ୍ ଠିକ୍ ରହିବ ନାହିଁ । "
+    },
+    {
+      "topic": "DIKSHA କଣ୍ଟେଣ୍ଟ୍ ହେତୁ ମୋ କମ୍ପ୍ୟୁଟରରେ କିଛି ଫ୍ରି ସ୍ପେସ୍ ନାହିଁ ",
+      "description": "ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରରେ ସ୍ପେସ୍ ଫ୍ରି କରିବା ପାଇଁ, ଆପ୍ ର ମାଇଁ ଡାଉନଲୋଡସ୍ ଟ୍ୟାବ୍ ରୁ ଡାଉନଲୋଡ୍ ହୋଇଥିବା କଣ୍ଟେଣ୍ଟ୍ ଡିଲିଟ୍ କରନ୍ତୁ "
+    },
+    {
+      "topic": "ମୋ Ubuntu ସିଷ୍ଟମରେ DIKSHA Desktop ଆପ୍ଲିକେସନ୍ ଇନଷ୍ଟଲ୍ କରିବାରେ ବିଫଳ",
+      "description": "<p>ଆପଣଙ୍କ ubuntu ସିଷ୍ଟମରେ DIKSHA ଡେସ୍କଟପ ଆପ୍ଲିକେସନ୍ ଇନଷ୍ଟଲ୍ କରିବା ପାଇଁ:</p>\n<p>1) ଆପଣଙ୍କ ଟର୍ମିନାଲ୍ ଓପନ୍ କରନ୍ତୁ</p>\n<p>2) ଯେଉଁଠାରେ exe ଫାଇଲ୍ ଡାଉନଲୋଡ୍ ହୋଇଛି, ସେହି ଡିରେକ୍ଟୋରି ବଦଳାଇବା ପାଇଁ, command cd<location> ରନ୍ କରନ୍ତୁ । ଉଦାହରଣ ସ୍ୱରୂପ, ଯଦି exe ଫାଇଲ୍ ଡାଉନଲୋଡସ୍ ଫୋଲଡରରେ ସେଭ୍ ହୋଇଛି, ତେବେ command cd Downloads ରନ୍ କରନ୍ତୁ</p>\n<p>3) sudo dpkg -i <filename> ରନ୍ କରନ୍ତୁ</p>\n<p>ଏହି command ସଫଳତାର ସହ ରନ୍ କରିବା ପରେ, ଆପ୍ଲିକେସନ୍ ଲଞ୍ଚ୍ ହେବ </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "ଏତିକି ଅକ୍ଷର ବାକି ",
+    "explainMsg": "ଆପଣ ସମସ୍ୟାଟିର ବ୍ୟାଖ୍ୟା କରିପାରିବେ କି ?",
+    "faqMsg": "ବାରମ୍ବାର ପଚରା ଯାଉଥିବା ପ୍ରଶ୍ନ ",
+    "help": " ସାହାଯ୍ୟ",
+    "helpMsg": "ଏହି ଉତ୍ତର ଆପଣଙ୍କ କାମରେ ଆସିଲା କି ?",
+    "initiateEmailButton": "ଇମେଲ ଆରମ୍ଭ କରନ୍ତୁ ",
+    "knowMoreMsg": "ଆପଣ ଆଉ କଣ ଜାଣିବାକୁ ଚାହୁଁଛନ୍ତି ?",
+    "noMsg": "ନାହିଁ ",
+    "reportIssue": "ଅସୁବିଧା ଜଣାନ୍ତୁ",
+    "reportIssueMsg": "ଅନ୍ୟ ସମସ୍ୟା ଜଣାନ୍ତୁ",
+    "resolveMsg": "ଆପଣଙ୍କ ସମସ୍ୟାର ସମାଧାନ କରିବା ନିମନ୍ତେ ପୂରା ସୂଚୀ ଦେଖନ୍ତୁ ",
+    "sorryMsg": "ସେଥିପାଇଁ ଦୁଃଖିତ",
+    "submitButton": "ସବମିଟ୍ କରନ୍ତୁ",
+    "tellMoreMsg": "ଆପଣ ସମ୍ମୁଖୀନ ହେଉଥିବା ସମସ୍ୟା ସମ୍ପର୍କରେ ଆମକୁ ଅଧିକ ବିବରଣୀ ଦିଅନ୍ତୁ",
+    "thanksMsg": "ଆପଣଙ୍କ ପ୍ରତିକ୍ରିୟା ପାଇଁ ଧନ୍ୟବାଦ ",
+    "triggerEmailMsg": "ଟେକ୍ସଟ୍ ବକ୍ସରେ ଆପଣ ବିସ୍ତୃତ ବିବରଣୀ ଯୋଗ କରି ଇନିସିଏଟ୍ ଇମେଲ୍ ବଟମ୍ ଟ୍ୟାପ୍ କଲେ, ଆମେ ଆପଣଙ୍କ ତରଫରୁ ଏକ ଇମେଲ୍ ଟ୍ରିଗର କରିବୁ | ଆପଣ ସେଠାରେ ଅଧିକ ବିବରଣୀ ଓ /କିମ୍ବା ଫାଇଲ୍ ଆଟାଚ୍ କରିପାରିବେ",
+    "typeHere": "ଏଠାରେ ଲେଖନ୍ତୁ ",
+    "yesMsg": "ହଁ "
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-pa.json b/utils/DesktopFAQ/faq-pa.json
new file mode 100644
index 000000000..23b6a878f
--- /dev/null
+++ b/utils/DesktopFAQ/faq-pa.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "ਮੈਂ ਆਪਣਾ ਬੋਰਡ, ਮਾਧਿਅਮ, ਕਲਾਸ ਅਤੇ ਵਿਸ਼ਾ ਨਹੀਂ ਦੇਖ ਸਕਦਾ",
+      "description": "ਤੁਹਾਡਾ ਰਾਜ ਇਸ ਸਮੇਂ ਸਾਰੇ ਬੋਰਡਾਂ, ਮਾਧਿਅਮ, ਕਲਾਸਾਂ ਅਤੇ ਵਿਸ਼ਿਆਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ। ਜਿਉਂ ਹੀ ਤੁਹਾਡਾ ਰਾਜ ਉਹਨਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੇਗਾ, ਤੁਸੀਂ ਇਸਨੂੰ ਸੂਚੀ ਵਿੱਚ ਵੇਖੋਗੇ"
+    },
+    {
+      "topic": "ਮੈਂ ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕੀਤੇ ਹਨ, ਪਰ ਮੈਂ ਇਸਨੂੰ ਚਲਾਉਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹਾਂ ਕਿਉਂਕਿ ਇਹ ਕਹਿੰਦਾ ਹੈ ਕਿ ਮੈਨੂੰ ਇੰਟਰਨੈਟ ਦੀ ਜ਼ਰੂਰਤ ਹੈ",
+      "description": "ਤੁਸੀਂ ਯੂਟਿਊਬ ਕੰਟੇਂਟ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਹੋ ਸਕਦਾ ਹੈ। ਤੁਸੀਂ ਉਦੋਂ ਹੀ ਯੂਟਿਊਬ ਕੰਟੇਂਟ ਨੂੰ ਚਲਾ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੁਸੀਂ ਆਨਲਾਈਨ ਹੋ। ਕੰਪਿਊਟਰ ਨੂੰ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
+    },
+    {
+      "topic": "ਮੈਨੂੰ ਆਪਣੀ DIKSHA ਡੈਸਕਟਾਪ ਐਪ ਨੂੰ ਅਪਡੇਟ ਕਰਨ ਦੀ ਜ਼ਰੂਰਤ ਹੈ",
+      "description": "ਆਪਣੇ ਕੰਪਿਊਟਰ ਨੂੰ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ ਅਤੇ ਨਵੀਨਤਮ ਐਪ ਸੰਸਕਰਣ ਲਈ https://staging.sunbirded.org/desktop/latest ਚੈੱਕ ਕਰੋ"
+    },
+    {
+      "topic": "ਮੇਰੇ ਕੋਲ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਵਾਲੇ ਲੈਪਟਾਪ ਤੱਕ ਐਕਸੈਸ ਨਹੀਂ ਹੈ, ਪਰ ਮੈਂ ਡੈਸਕਟੌਪ ਐਪ 'ਤੇ ਕੰਟੇਂਟ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨਾ ਜਾਂ ਅਪਡੇਟ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹਾਂ",
+      "description": "ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਮੋਬਾਈਲ ਫ਼ੋਨ ਹੈ, DIKSHA ਮੋਬਾਈਲ ਐਪ ਨੂੰ ਗੂਗਲ ਪਲੇਸਟੋਰ ਤੋਂ ਡਾਊਨਲੋਡ ਕਰੋ।\nਐਪ ਵਿਚਲੇ ਕੰਟੇਂਟ ਲਈ ਬਰਾਊਜ਼ ਕਰੋ।\nDIKSHA ਲਾਇਬ੍ਰੇਰੀ ਤੋਂ ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕਰੋ।\nਇਸਨੂੰ ਪੈੱਨਡਰਾਈਵ ਜਾਂ SD ਕਾਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ ਅਤੇ ਇਸਨੂੰ DIKSHA ਐਪ 'ਤੇ ਅਪਲੋਡ ਕਰੋ।"
+    },
+    {
+      "topic": "ਮੈਨੂੰ ਕਿਸੇ ਖ਼ਾਸ ਵਿਸ਼ੇ ਲਈ ਕੰਟੇਂਟ ਨਹੀਂ ਮਿਲਦੇ, ਜਾਂ ਅਢੁੱਕਵੇਂ ਕੰਟੇਂਟ ਮਿਲਦੇ ਹਨ",
+      "description": "ਕੰਟੇਂਟ ਦੀ ਭਾਲ ਕਰਨ ਲਈ DIKSHA ਦੀ ਆਨਲਾਈਨ ਲਾਇਬ੍ਰੇਰੀ ਨੂੰ ਬਰਾਊਜ਼ ਕਰੋ। ਜੇ ਇਹ ਅਜੇ ਵੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ, ਤਾਂ ਕੰਟੇਂਟ ਬਾਰੇ ਆਪਣੀ ਫੀਡਬੈਕ ਸਟੇਟ SCERT ਨੂੰ ਭੇਜੋ"
+    },
+    {
+      "topic": "ਐਪ ਬਹੁਤ ਹੌਲੀ ਹੈ",
+      "description": "ਐਪ ਦੀ ਕਾਰਗੁਜ਼ਾਰੀ ਨੂੰ ਤੇਜ਼ ਕਰਨ ਲਈ, ਇਹ ਕਰੋ:\n<br>ਆਪਣੇ ਕੰਪਿਊਟਰ ਦੀ ਸਿਸਟਮ ਕੌਨਫਿਗਰੇਸ਼ਨ 'ਤੇ ਜਾਓ। ਘੱਟੋ ਘੱਟ ਕੌਂਫਿਗਰੇਸ਼ਨ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ:\n<ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br>ਜੇ ਤੁਹਾਡਾ ਕੰਪਿਊਟਰ ਇਸ ਕੌਂਫਿਗਰੇਸ਼ਨ ਨਾਲ ਮੇਲ ਖਾਂਦਾ ਜਾਂ ਵੱਧ ਹੈ, ਤਾਂ ਐਪ ਨੂੰ ਮੁੜ ਚਾਲੂ ਕਰੋ।\n<br>ਅਜਿਹਾ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਜੇ ਇਹ ਅਜੇ ਵੀ ਹੌਲੀ ਹੈ, <b>ਟਾਸਕ ਮੈਨੇਜਰ</b> 'ਤੇ ਜਾਓ,\nਸਾਰੀਆਂ ਨਾ ਵਰਤੀਆਂ ਬੈਕਗਰਾਂਊਡ ਪ੍ਰਕਿਰਿਆਵਾਂ ਨੂੰ ਚੁਣੋ ਅਤੇ ਕਲਿੱਕ ਕਰੋ<b>End Task</b>"
+    },
+    {
+      "topic": "ਮੈਂ ਪੈੱਨਡਰਾਈਵ ਵਿੱਚ ਕੰਟੇਂਟ ਦੀ ਨਕਲ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ ਹਾਂ",
+      "description": "ਪੈੱਨਡਰਾਈਵ 'ਤੇ ਕੰਟੇਂਟ ਦੀ ਨਕਲ ਕਰਨ ਲਈ, ਇਹ ਕਰੋ:\n<ul><li>ਆਪਣੀ ਕੰਪਿਊਟਰ ਸੈਟਿੰਗਸ 'ਤੇ ਜਾਓ। ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ USB ਡਰਾਈਵ ਲਿਖਣ ਤੋਂ ਸੁਰੱਖਿਅਤ ਹੈ। ਜੇ ਇਹ ਹੈ, ਤਾਂ ਸੁਰੱਖਿਆ ਨੂੰ ਅਯੋਗ ਕਰੋ</li>\n<li>ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਪੈੱਨਡਰਾਈਵ ਵਿੱਚ ਖ਼ਾਲੀ ਥਾਂ ਹੈ। ਆਪਣੀ ਪੈੱਨਡਰਾਈਵ ਤੋਂ ਅਣਚਾਹੀਆਂ ਫਾਈਲਾਂ ਨੂੰ ਡੀਲੀਟ ਕਰੋ</li></ul>\n"
+    },
+    {
+      "topic": "ਮੈਂ ਆਪਣੀ ਪੇਨਡਰਾਈਵ 'ਤੇ ਕੰਟੇਂਟ ਲੋਡ ਕੀਤੇ ਸਨ, ਪਰ ਹੁਣ ਮੈਂ ਵੇਖਦਾ ਹਾਂ ਕਿ ਇਹ ਖ਼ਾਲੀ ਹੈ",
+      "description": "ਤੁਹਾਡੀ ਪੇਨਡਰਾਈਵ ਜਾਂ ਕੰਪਿਊਟਰ ਕਿਸੇ ਵਾਇਰਸ ਨਾਲ ਸੰਕਰਮਿਤ ਹੋ ਸਕਦਾ ਹੈ। ਇਹ ਵੇਖੋ ਕਿ:\n* ਤੁਹਾਡੀ ਮਸ਼ੀਨ 'ਤੇ ਇਕ ਐਂਟੀ ਵਾਇਰਸ ਸਾਫਟਵੇਅਰ ਸਥਾਪਤ ਹੈ\n* ਤੁਹਾਡੀ ਪੇਨਡਰਾਈਵ ਨੂੰ ਅਣਜਾਣ ਮਸ਼ੀਨਾਂ ਵਿਚ ਲਗਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਲਿਖਤ-ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਗਿਆ ਹੈ"
+    },
+    {
+      "topic": "ਮੇਰੀ ਪੇਨਡਰਾਈਵ 'ਤੇ ਅਤੇ ਪੇਨਡਰਾਈਵ ਤੋਂ ਕੰਟੇਂਟ ਦੀ ਨਕਲ ਕਰਨ ਲਈ ਸਮਾਂ ਲਗਦਾ ਹੈ",
+      "description": "ਕਾਪੀ ਕਰਨ ਲਈ ਲਿਆ ਗਿਆ ਸਮਾਂ ਕੰਟੇਂਟ ਫਾਈਲ ਦੇ ਅਕਾਰ 'ਤੇ ਨਿਰਭਰ ਕਰਦਾ ਹੈ। ਕੁਝ ਵੱਡੀਆਂ ਪਾਠ-ਪੁਸਤਕਾਂ ਦੀ ਨਕਲ ਕਰਨ ਲਈ ਸਮਾਂ ਲੱਗਦਾ ਹੈ। ਅਸੀਂ ਤੁਹਾਨੂੰ ਸਿਫਾਰਸ਼ ਕਰਦੇ ਹਾਂ ਕਿ ਤੁਸੀਂ ਪ੍ਰਕਿਰਿਆ ਨੂੰ ਵਿਚਕਾਰ ਨਾ ਰੋਕੋ। ਅਜਿਹਾ ਕਰਨ ਨਾਲ ਅਸੰਗਤ ਫਾਈਲਾਂ ਲੱਗ ਸਕਦੀਆਂ ਹਨ।"
+    },
+    {
+      "topic": "ਮੇਰੇ ਕੰਪਿਊਟਰ ਵਿੱਚ DIKSHA ਕੰਟੇਂਟ ਕਾਰਨ ਕੋਈ ਖ਼ਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ",
+      "description": "ਆਪਣੇ ਕੰਪਿਊਟਰ 'ਤੇ ਜਗ੍ਹਾ ਖ਼ਾਲੀ ਕਰਨ ਲਈ ਐਪ ਦੀ ਮਾਈ ਡਾਊਨਲੋਡਸ ਟੈਬ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੇ ਕੰਟੇਂਟ ਨੂੰ ਡੀਲੀਟ ਕਰੋ"
+    },
+    {
+      "topic": "ਮੇਰੇ ਉਬੰਤੂ ਸਿਸਟਮ 'ਤੇ DIKSHA ਡੈਸਕਟਾਪ ਐਪਲੀਕੇਸ਼ਨ ਸਥਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ",
+      "description": "<p>ਆਪਣੇ ਉਬੰਤੂ ਸਿਸਟਮ 'ਤੇ DIKSHA ਡੈਸਕਟਾਪ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਸਥਾਪਤ ਕਰਨ ਲਈ:</p>\n<p>1) ਆਪਣਾ ਟਰਮੀਨਲ ਖੋਲ੍ਹੋ</p>\n<p>2) ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਲਈ ਸੀਡੀ <ਲੋਕੇਸ਼ਨ> ਕਮਾਂਡ ਚਲਾਓ, ਜਿੱਥੇ exe ਫਾਈਲ ਡਾਊਨਲੋਡ ਕੀਤੀ ਗਈ ਹੈ। ਉਦਾਹਰਣ ਲਈ, ਜੇ exe ਨੂੰ ਡਾਊਨਲੋਡਸ ਫੋਲਡਰ ਵਿੱਚ ਸੇਵ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ ਸੀਡੀ ਡਾਊਨਲੋਡਸ ਕਮਾਂਡ ਚਲਾਓ</p>\n<p>3) sudo dpkg -i <ਫਾਈਲ ਦਾ ਨਾਮ>ਕਮਾਂਡ ਚਲਾਓ </p>\n<p>ਇਸ ਕਮਾਂਡ ਨੂੰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਚਲਾਉਣ 'ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਲਾਂਚ ਹੋ ਜਾਂਦੀ ਹੈ </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "ਅੱਖਰ ਬਚੇ",
+    "explainMsg": "ਕੀ ਤੁਸੀਂ ਸਮੱਸਿਆ ਬਾਰੇ ਦੱਸ ਸਕਦੇ ਹੋ?",
+    "faqMsg": "ਅਕਸਰ ਪੁੱਛੇ ਜਾਣ ਵਾਲੇ ਸਵਾਲ",
+    "help": "ਮਦਦ ",
+    "helpMsg": "ਕੀ ਇਸ ਜਵਾਬ ਨੇ ਤੁਹਾਡੀ ਮਦਦ ਕੀਤੀ?",
+    "initiateEmailButton": "ਈਮੇਲ ਅਰੰਭ ਕਰੋ",
+    "knowMoreMsg": "ਤੁਸੀਂ ਹੋਰ ਕੀ ਜਾਣਨਾ ਚਾਹੋਗੇ?",
+    "noMsg": "ਨਹੀਂ",
+    "reportIssue": " ਮੁੱਦੇ ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
+    "reportIssueMsg": "ਹੋਰ ਮੁੱਦੇ ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
+    "resolveMsg": "ਆਪਣੇ ਮੁੱਦੇ ਨੂੰ ਸੁਲਝਾਉਣ ਲਈ ਸੂਚੀ ਨੂੰ ਵੇਖੋ",
+    "sorryMsg": "ਉਸ ਲਈ ਮੈ ਅਫ਼ਸੋਸ ਕਰਦਾਂ!",
+    "submitButton": "ਜਮ੍ਹਾ ਕਰੋ",
+    "tellMoreMsg": "ਆਪਣੀਆ ਸਮੱਸਿਆ ਦੇ ਬਾਰੇ ਸਾਨੂੰ ਹੋਰ ਦੱਸੋ",
+    "thanksMsg": "ਤੁਹਾਡੇ ਜਵਾਬ ਲਈ ਧੰਨਵਾਦ!",
+    "triggerEmailMsg": "ਟੈਕਸਟ ਬਾਕਸ ਵਿੱਚ ਵੇਰਵੇ ਸ਼ਾਮਲ ਕਰਨ ਅਤੇ ਈਮੇਲ ਅਰੰਭ ਬਟਨ ਨੂੰ ਟੈਪ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਅਸੀਂ ਤੁਹਾਡੇ ਵੱਲੋਂ ਇਕ ਈਮੇਲ ਜਾਰੀ ਕਰਾਂਗੇ।ਤੁਸੀਂ ਇਸ ਈਮੇਲ ਵਿੱਚ ਹੋਰ ਵੇਰਵੇ ਅਤੇ /ਜਾਂ ਫਾਈਲਾਂ ਨੂੰ ਇੱਥੇ ਜੋੜ ਸਕਦੇ ਹੋ।",
+    "typeHere": "ਇੱਥੇ ਟਾਈਪ ਕਰੋ ...",
+    "yesMsg": "ਹਾਂ"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-ta.json b/utils/DesktopFAQ/faq-ta.json
new file mode 100644
index 000000000..73ac9b753
--- /dev/null
+++ b/utils/DesktopFAQ/faq-ta.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "எனது வாரியம், மொழி வழி கல்வி, வகுப்பு மற்றும் தலைப்பு ஆகியவற்றை என்னால் பார்க்க முடியவில்லை ",
+      "description": "உங்கள் மாநிலம் தற்போது அனைத்து வாரியங்கள், ஊடகங்கள், வகுப்புகள் மற்றும் பாடங்களை ஆதரிக்கவில்லை. உங்கள் மாநிலம் அவற்றைச் சேர்த்தவுடன், அதை நீங்கள் பட்டியலில் காண்பீர்கள்"
+    },
+    {
+      "topic": "நான் உள்ளடக்கத்தைப் பதிவிறக்கம் செய்தேன், ஆனால் எனக்கு இணையம் தேவை என்று கூறியதால் என்னால் அதை இயக்க முடியவில்லை",
+      "description": "நீங்கள் YouTube உள்ளடக்கத்தை பதிவிறக்கம் செய்திருக்கலாம். நீங்கள் ஆன்லைனில் இருக்கும்போது மட்டுமே YouTube உள்ளடக்கத்தை இயக்க முடியும். கணினியை இணையத்துடன் இணைக்க மீண்டும் முயற்சிக்கவும்."
+    },
+    {
+      "topic": "எனது DIKSHA டெஸ்க்டாப் செயலியை புதுப்பிக்க வேண்டும்",
+      "description": "உங்கள் கணினியை இணையத்துடன் இணைத்து, சமீபத்திய பயன்பாட்டு பதிப்பிற்காக https://staging.sunbirded.org/desktop/latest க்கு செல்லவும் "
+    },
+    {
+      "topic": "இணைய இணைப்புடன் மடிக்கணினிக்கு அணுகல் இல்லை, ஆனால் டெஸ்க்டாப் செயலியில் உள்ளடக்கத்தை சேர்க்க அல்லது புதுப்பிக்க விரும்புகிறேன்",
+      "description": "உங்களிடம் கைப்பேசி இருந்தால், கூகிள் பிளேஸ்டோரிலிருந்து DIKSHA மொபைல் செயலியை பதிவிறக்கவும். செயலியில் உள்ள உள்ளடக்கத்திற்காக உலாவுக. DIKSHA நூலகத்திலிருந்து உள்ளடக்கத்தைப் பதிவிறக்கவும். பென்ட்ரைவ் அல்லது எஸ்டி கார்டில் நகலெடுத்து அதை DIKSHA டெஸ்க்டாப் செயலியில் பதிவேற்றவும்."
+    },
+    {
+      "topic": "ஒரு குறிப்பிட்ட தலைப்புக்கான உள்ளடக்கம் கிடைக்கவில்லை, அல்லது பொருத்தமற்ற உள்ளடக்கத்தைக் காண்கிறேன்",
+      "description": "உள்ளடக்கத்தைத் தேட DIKSHA இன் ஆன்லைன் நூலகத்தை உலாவுக. இது இன்னும் கிடைக்கவில்லை என்றால், உள்ளடக்கத்தைப் பற்றிய உங்கள் கருத்தை மாநில SCERT க்கு அனுப்புங்கள்"
+    },
+    {
+      "topic": "பயன்பாடு மிகவும் மெதுவாக உள்ளது",
+      "description": "செயலியின் செயல்திறனை விரைவுபடுத்த, பின்வருவனவற்றைச் செய்யுங்கள்: <br> உங்கள் கணினியின் கணினி உள்ளமைவுக்குச் செல்லவும். குறைந்தபட்ச உள்ளமைவு இருக்க வேண்டும்: <ul> <li> 2 ஜிபி ரேம் </li> <li> இரட்டை கோர் செயலி </li> </ul> <br> உங்கள் கணினி இந்த உள்ளமைவுடன் பொருந்தினால் அல்லது மீறினால், பயன்பாட்டை மறுதொடக்கம் செய்யுங்கள். <br> இதைச் செய்தபின், அது இன்னும் மெதுவாக இருந்தால், <b> பணி நிர்வாகி </b> க்குச் சென்று, பயன்படுத்தப்படாத அனைத்து பின்னணி செயல்முறைகளையும் தேர்ந்தெடுத்து <b> பணியை முடிக்க </b> என்பதைக் கிளிக் செய்க"
+    },
+    {
+      "topic": "பென்ட்ரைவிற்கு உள்ளடக்கத்தை நகலெடுக்க என்னால் முடியவில்லை",
+      "description": "உள்ளடக்கத்தை பென் டிரைவில் நகலெடுக்க, பின்வருவனவற்றைச் செய்யுங்கள்: <ul> <li> உங்கள் கணினி அமைப்புகளுக்குச் செல்லவும். யூ.எஸ்.பி டிரைவ் எழுத-பாதுகாக்கப்பட்டதா என சரிபார்க்கவும். அது இருந்தால், பாதுகாப்பை முடக்கவும் </li> <li> பென் டிரைவிற்கு இலவச இடம் இருக்கிறதா என்று சோதிக்கவும். பென்ட்ரைவிலிருந்து தேவையற்ற கோப்புகளை நீக்கு </li> </ul>"
+    },
+    {
+      "topic": "எனது பென்ட்ரைவில் உள்ளடக்கத்தை ஏற்றினேன், ஆனால் இப்போது அது காலியாக இருப்பதைக் காண்கிறேன்",
+      "description": "உங்கள் பென்ட்ரைவ் அல்லது கணினி வைரஸால் பாதிக்கப்படலாம். இதைச் சரிபார்க்கவும்: * உங்கள் கணினியில் ஒரு வைரஸ் எதிர்ப்பு மென்பொருள் நிறுவப்பட்டுள்ளது * நீங்கள் அறியப்படாத கணினிகளில் செருகுவதற்கு முன்பு உங்கள் பென்ட்ரைவ் எழுத-பாதுகாக்கப்படுகிறது"
+    },
+    {
+      "topic": "எனது பென்ட்ரைவிலிருந்து உள்ளடக்கத்தை நகலெடுக்க நேரம் எடுக்கும்",
+      "description": "நகலெடுக்க எடுக்கப்பட்ட நேரம் உள்ளடக்கக் கோப்பின் அளவைப் பொறுத்தது. சில பெரிய பாடப்புத்தகங்கள் நகலெடுக்க நேரம் எடுக்கும். இடையில் செயல்பாட்டை நிறுத்த வேண்டாம் என்று நாங்கள் பரிந்துரைக்கிறோம். அவ்வாறு செய்வது சீரற்ற கோப்புகளுக்கு வழிவகுக்கும்."
+    },
+    {
+      "topic": "DIKSHA உள்ளடக்கம் காரணமாக எனது கணினியில் இடம் இல்லை",
+      "description": "உங்கள் கணினியில் இடத்தை விடுவிக்க பயன்பாட்டின் எனது பதிவிறக்கங்கள் தாவலில் இருந்து பதிவிறக்கம் செய்யப்பட்ட உள்ளடக்கத்தை நீக்கு"
+    },
+    {
+      "topic": "எனது உபுண்டு கணினியில் DIKSHA டெஸ்க்டாப் செயலியை நிறுவ முடியவில்லை",
+      "description": "<p> உங்கள் உபுண்டு கணினியில் DIKSHA டெஸ்க்டாப் செயலியை நிறுவ: </ p> <p> 1) உங்கள் டெர்மினல் திறக்கவும் </p> <p> 2) கோப்பகத்தை exe கோப்பு இருக்கும் இடத்திற்கு மாற்ற cd <location> கட்டளையை இயக்கவும் பதிவிறக்கம் செய்யப்பட்டது. எடுத்துக்காட்டாக, பதிவிறக்க கோப்புறையில் exe சேமிக்கப்பட்டால், cd பதிவிறக்கங்கள் </p> <p> 3) கட்டளையை இயக்கவும் sudo dpkg -i <filename> </p> <p> இந்த கட்டளையை வெற்றிகரமாக இயக்கும் போது பயன்பாடு தொடங்கப்பட்டது </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "விடுபட்ட எழுத்துக்கள்",
+    "explainMsg": "பிரச்சனையை நீங்கள் விளக்க முடியுமா?",
+    "faqMsg": "அடிக்கடி கேட்கப்படும் கேள்விகள்",
+    "help": "உதவி",
+    "helpMsg": "இந்த பதில் உங்களுக்கு உதவியதா?",
+    "initiateEmailButton": "மின்னஞ்சல் தொடங்குக",
+    "knowMoreMsg": "நீங்கள் இன்னும் தெரிந்து கொள்ள விரும்புகிறீர்களா?",
+    "noMsg": "இல்லை",
+    "reportIssue": "சிக்கலைப் புகாரளி",
+    "reportIssueMsg": "பிற சிக்கலைப் புகாரளி",
+    "resolveMsg": "உங்கள் சிக்கலை தீர்க்க பட்டியலை பாருங்கள்",
+    "sorryMsg": "மன்னிக்கவும்!",
+    "submitButton": "சமர்ப்பி",
+    "tellMoreMsg": "நீங்கள் சந்தித்த பிரச்சனை பற்றி மேலும் சொல்லுங்கள்",
+    "thanksMsg": "உங்கள் பதிலுக்கு நன்றி!",
+    "triggerEmailMsg": "நீங்கள் உரை பெட்டியில் விவரங்களைச் சேர்த்து, மின்னஞ்சல் தொடங்குக பொத்தானைத் தட்டவும், உங்கள் சார்பாக ஒரு மின்னஞ்சலை தூண்டுகிறோம். நீங்கள் மேலும் விவரங்களைச் சேர்க்க மற்றும் / அல்லது அங்கு கோப்புகளை இணைக்க முடியும்.",
+    "typeHere": "இங்கே உள்ளிடவும் ...",
+    "yesMsg": "ஆம்"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-te.json b/utils/DesktopFAQ/faq-te.json
new file mode 100644
index 000000000..dc7b45332
--- /dev/null
+++ b/utils/DesktopFAQ/faq-te.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "నా బోర్డు, మీడియం, క్లాస్ మరియు సబ్జెక్టును నేను చూడలేను",
+      "description": "మీ రాష్ట్రం ప్రస్తుతం అన్ని బోర్డులు, మాధ్యమాలు, తరగతులు మరియు విషయాలకు మద్దతు ఇవ్వదు. మీ రాష్ట్రం వాటిని జోడించిన వెంటనే, మీరు దానిని జాబితాలో చూస్తారు"
+    },
+    {
+      "topic": "నేను కంటెంట్‌ను డౌన్‌లోడ్ చేసాను, కాని నేను దీన్ని ప్లే చేయలేకపోతున్నాను ఎందుకంటే నాకు ఇంటర్నెట్ అవసరం అని చెప్పింది",
+      "description": "మీరు యూట్యూబ్ కంటెంట్‌ను డౌన్‌లోడ్ చేసి ఉండవచ్చు. మీరు ఆన్‌లైన్‌లో ఉన్నప్పుడు మాత్రమే మీరు యూట్యూబ్ కంటెంట్‌ను ప్లే చేయవచ్చు. కంప్యూటర్‌ను ఇంటర్నెట్‌కు కనెక్ట్ చేయండి మళ్లీ ప్రయత్నించండి."
+    },
+    {
+      "topic": "నేను నా DIKSHA డెస్క్‌టాప్ అనువర్తనాన్ని నవీకరించాలి",
+      "description": "మీ కంప్యూటర్‌ను ఇంటర్నెట్‌కు కనెక్ట్ చేయండి మరియు తాజా అనువర్తన సంస్కరణ కోసం https://staging.sunbirded.org/desktop/latest ని తనిఖీ చేయండి"
+    },
+    {
+      "topic": "నాకు ఇంటర్నెట్ కనెక్షన్ ఉన్న ల్యాప్‌టాప్‌కు ప్రాప్యత లేదు, కానీ నేను డెస్క్‌టాప్ అనువర్తనంలో కంటెంట్‌ను జోడించాలనుకుంటున్నాను లేదా నవీకరించాలనుకుంటున్నాను",
+      "description": "మీకు మొబైల్ ఫోన్ ఉంటే, గూగుల్ ప్లేస్టోర్ నుండి DIKSHA మొబైల్ అనువర్తనాన్ని డౌన్‌లోడ్ చేయండి.\n అనువర్తనంలోని కంటెంట్ కోసం బ్రౌజ్ చేయండి.\n DIKSHA లైబ్రరీ నుండి కంటెంట్‌ను డౌన్‌లోడ్ చేయండి.\n దీన్ని పెన్‌డ్రైవ్ లేదా SD కార్డ్‌లో కాపీ చేసి, DIKSHA డెస్క్‌టాప్ అనువర్తనానికి అప్‌లోడ్ చేయండి."
+    },
+    {
+      "topic": "నేను ఒక నిర్దిష్ట అంశం కోసం కంటెంట్‌ను కనుగొనలేదు, లేదా కంటెంట్ అసంబద్ధం అని నేను భావిస్తున్నాను",
+      "description": "కంటెంట్ కోసం శోధించడానికి DIKSHA యొక్క ఆన్‌లైన్ లైబ్రరీని బ్రౌజ్ చేయండి. ఇది ఇప్పటికీ అందుబాటులో లేకపోతే, కంటెంట్ గురించి మీ అభిప్రాయాన్ని స్టేట్ SCERT కి పంపండి"
+    },
+    {
+      "topic": "అనువర్తనం చాలా నెమ్మదిగా ఉంది",
+      "description": "అనువర్తన పనితీరును వేగవంతం చేయడానికి, కింది వాటిని చేయండి:\n <br> మీ కంప్యూటర్ సిస్టమ్ కాన్ఫిగరేషన్‌కు వెళ్లండి. కనీస కాన్ఫిగరేషన్ ఉండాలి:\n <ul> <li> 2 GB RAM </li>\n <li> ద్వంద్వ కోర్ ప్రాసెసర్ </ li> </ul>\n <br> మీ కంప్యూటర్ ఈ కాన్ఫిగరేషన్‌తో సరిపోలితే లేదా మించి ఉంటే, అనువర్తనాన్ని మళ్ళీ ప్రారంభించండి.\n <br> దీన్ని చేసిన తర్వాత, అది ఇంకా నెమ్మదిగా ఉంటే, <b> టాస్క్ మేనేజర్ </b> కు వెళ్లండి,\n ఉపయోగించని అన్ని నేపథ్య ప్రక్రియలను ఎంచుకోండి మరియు <b> ఎండ్ టాస్క్ </b> క్లిక్ చేయండి"
+    },
+    {
+      "topic": "నేను పెన్‌డ్రైవ్‌కు కంటెంట్‌ను కాపీ చేయలేకపోతున్నాను",
+      "description": "పెన్ డ్రైవ్‌కు కంటెంట్‌ను కాపీ చేయడానికి, కింది వాటిని చేయండి:\n <ul> <li> మీ కంప్యూటర్ సెట్టింగ్‌లకు వెళ్లండి. USB డ్రైవ్ వ్రాసే-రక్షించబడిందో లేదో తనిఖీ చేయండి. అది ఉంటే, రక్షణను నిలిపివేయండి </li> </li>\n <li> పెన్ డ్రైవ్‌లో ఖాళీ స్థలం ఉందో లేదో తనిఖీ చేయండి. పెన్‌డ్రైవ్ నుండి అవాంఛిత ఫైల్‌లను తొలగించండి </li> </ul>"
+    },
+    {
+      "topic": "నేను నా పెన్‌డ్రైవ్‌లో కంటెంట్‌ను లోడ్ చేసాను, కాని ఇప్పుడు అది ఖాళీగా ఉందని నేను చూశాను",
+      "description": "మీ పెన్‌డ్రైవ్ లేదా కంప్యూటర్ వైరస్ బారిన పడవచ్చు. దాన్ని తనిఖీ చేయండి:\n * మీ మెషీన్‌లో యాంటీ వైరస్ సాఫ్ట్‌వేర్ ఇన్‌స్టాల్ చేయబడింది\n * మీరు తెలియని యంత్రాలలో ప్లగ్ చేయడానికి ముందు మీ పెన్‌డ్రైవ్ వ్రాతపూర్వకంగా రక్షించబడుతుంది"
+    },
+    {
+      "topic": "నా పెన్‌డ్రైవ్‌కు మరియు నుండి కంటెంట్‌ను కాపీ చేయడానికి సమయం పడుతుంది",
+      "description": "కాపీ చేయడానికి తీసుకున్న సమయం కంటెంట్ ఫైల్ పరిమాణంపై ఆధారపడి ఉంటుంది. కొన్ని పెద్ద పాఠ్యపుస్తకాలు కాపీ చేయడానికి సమయం పడుతుంది. ఈ ప్రక్రియను మీరు మధ్యలో ఆపవద్దని మేము సిఫార్సు చేస్తున్నాము. అలా చేయడం వలన అస్థిరమైన ఫైళ్లు ఏర్పడవచ్చు."
+    },
+    {
+      "topic": "DIKSHA కంటెంట్ కారణంగా నా కంప్యూటర్‌కు ఖాళీ స్థలం లేదు",
+      "description": "మీ కంప్యూటర్‌లో ఖాళీ స్థలం కోసం ఖాళీ చేయడానికి అనువర్తనం యొక్క నా డౌన్‌లోడ్ ట్యాబ్ నుండి డౌన్‌లోడ్ చేసిన కంటెంట్‌ను తొలగించండి"
+    },
+    {
+      "topic": "నా ఉబుంటు సిస్టమ్‌లో DIKSHA డెస్క్‌టాప్ అప్లికేషన్‌ను ఇన్‌స్టాల్ చేయడం సాధ్యం కాలేదు",
+      "description": "> మీ ఉబుంటు సిస్టమ్‌లో DIKSHA డెస్క్‌టాప్ అప్లికేషన్‌ను ఇన్‌స్టాల్ చేయడానికి: </p>\n <p> 1) మీ టెర్మినల్ తెరవండి </p>\n <p> 2)cd ఆదేశాన్ని అమలు చేయండి <location> డైరెక్టరీని exe ఫైల్ డౌన్‌లోడ్ చేయబడిన చోటికి మార్చడానికి. ఉదాహరణకు, డౌన్‌లోడ్ ఫోల్డర్‌లో exe సేవ్ చేయబడితే, cd డౌన్‌లోడ్‌లు ఆదేశాన్ని అమలు చేయండి</p> \n <p> 3) sudo dpkg -i <filename> ఆదేశాన్ని అమలు చేయండి</p>\n <p> ఈ ఆదేశాన్ని విజయవంతంగా అమలు చేస్తున్నప్పుడు అప్లికేషన్ ప్రారంభించబడింది </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "అక్షరాలు మిగిలి ఉన్నాయి",
+    "explainMsg": "మీరు సమస్యను వివరించగలరా?",
+    "faqMsg": "తరచుగా అడిగే ప్రశ్నలు",
+    "help": "సహాయం కావాలి",
+    "helpMsg": "ఈ సమాధానం మీకు సహాయపడిందా?",
+    "initiateEmailButton": "ఇమెయిల్ను ప్రారంభించండి",
+    "knowMoreMsg": "మీరు మరింత తెలుసుకోవాలనుకుంటున్న విషయం ఏంటి?",
+    "noMsg": "కాదు",
+    "reportIssue": "సమస్యను నివేదించండి",
+    "reportIssueMsg": "ఇతర సమస్యను నివేదించండి",
+    "resolveMsg": "మీ సమస్యను పరిష్కరించడానికి జాబితాను చూడండి",
+    "sorryMsg": "అలా జరిగినందుకు క్షమించండి!",
+    "submitButton": "సమర్పించండి",
+    "tellMoreMsg": "మీరు ఎదుర్కొన్న సమస్య గురించి మాకు మరింత తెలియజేయండి",
+    "thanksMsg": "మీ ప్రతిస్పందన కోసం ధన్యవాదాలు!",
+    "triggerEmailMsg": "మీరు టెక్స్ట్ బాక్స్లో వివరాలను జోడించి, ఇమెయిల్(Initiate) బటన్ను నొక్కితే, మీ తరపున మేము ఒక ఇమెయిల్ను ప్రేరేపిస్తాము. మీరు మరింత వివరాలను జోడించవచ్చు మరియు / లేదా అక్కడ ఫైల్లను అటాచ్ చేయవచ్చు.",
+    "typeHere": "ఇక్కడ టైపు చేయండి..",
+    "yesMsg": "అవును"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-ur.json b/utils/DesktopFAQ/faq-ur.json
new file mode 100644
index 000000000..71445fd94
--- /dev/null
+++ b/utils/DesktopFAQ/faq-ur.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "میں اپنا بورڈ ، میڈیم ، کلاس اور سبجیکٹ نہیں دیکھ سکتا ہوں",
+      "description": "آپ کی ریاست فی الحال تمام بورڈ ، میڈیم ، کلاس اور مضامین کی حمایت نہیں کرتی ہے۔ جیسے ہی آپ کی ریاست نے ان کو شامل کیا ، آپ اسے فہرست میں دیکھیں گے"
+    },
+    {
+      "topic": "میں نے یہ مواد ڈاؤن لوڈ کیا ہے ، لیکن میں اسے کھولنے سے قاصر ہوں کیونکہ اس کے مطابق مجھے انٹرنیٹ کی ضرورت ہے",
+      "description": "ہوسکتا ہے کہ آپ نے YouTube کا مواد ڈاؤن لوڈ کیا ہو۔ جب آپ آن لائن ہوں تو آپ YouTube کا مواد کھول سکتے ہیں۔ کمپیوٹر کو دوبارہ انٹرنیٹ سے جوڑنے کی کوشش کریں۔"
+    },
+    {
+      "topic": "مجھے اپنی DIKSHA ڈیسک ٹاپ ایپ کو اپ ڈیٹ کرنے کی ضرورت ہے",
+      "description": "اپنے کمپیوٹر کو انٹرنیٹ سے جڑیں اور‪https://staging.sunbirded.org/desktop/latest‬ پر جدید ایپ ورژن کے لئے چیک کریں"
+    },
+    {
+      "topic": "مجھے انٹرنیٹ کنیکشن والے لیپ ٹاپ تک رسائی حاصل نہیں ہے ، لیکن میں ڈیسک ٹاپ ایپ پر مواد شامل یا اپ ڈیٹ کرنا چاہتا ہوں",
+      "description": "اگر آپ کے پاس موبائل فون ہے تو ، گوگل پلے اسٹور سے DIKSHA موبائل اپلی کیشن ڈاؤن لوڈ کریں۔\nایپ میں موجود مواد کے لئے براؤز کریں۔\nDIKSHA لائبریری سے مواد ڈاؤن لوڈ کریں۔\nاسے PenDrive یا SD کارڈ میں کاپی کریں اور DIKSHA ڈیسک ٹاپ ایپ پر اپ لوڈ کریں۔"
+    },
+    {
+      "topic": "مجھے کسی خاص عنوان کے لئے مواد نہیں ملتا ہے ، یا مجھے یہ مواد غیر متعلق معلوم ہوتا ہے",
+      "description": "مواد کی تلاش کے لئے DIKSHA کی آن لائن لائبریری کو براؤز کریں۔ اگر یہ ابھی بھی دستیاب نہیں ہے تو، مواد کے بارے میں اپنی رائے اسٹیٹ SCERT کو بھیجیں"
+    },
+    {
+      "topic": "ایپ بہت آہستہ ہے",
+      "description": "ایپ کی کارکردگی کو تیز کرنے کے لئے ، درج ذیل کام کریں:\n<br>اپنے کمپیوٹر سسٹم کی تشکیل پر جائیں.کم از کم ترتیب یہ ہونی چاہئے:\n‪<li/>2 GB RAM<li>‬‪<ul>‬\n‪<li/>ڈبل کور پروسیسر<li>‬\n</ul>\n<br>اگر آپ کا کمپیوٹر اس ترتیب سے میچ کرتا ہے یا اس سے زیادہ ہے تو ، ایپ کو دوبارہ شروع کریں۔\n<br>ایسا کرنے کے بعد ، اگر یہ اب بھی آہستہ ہے ، تو<b>ٹاسک مینیجر</b>کے پاس جاؤ\nغیر استعمال شدہ پس منظر کے تمام عمل منتخب کریں اور<b>اینڈ ٹاسک</b>پر کلک کریں"
+    },
+    {
+      "topic": "میں پین ڈرائیو میں مواد کو کاپی کرنے سے قاصر ہوں",
+      "description": "پین ڈرائیو میں مواد کی کاپی کرنے کے لئے ، درج ذیل کریں:\n<ul>\n<li>اپنے کمپیوٹر کی ترتیبات پر جائیں۔ چیک کریں کہ USB ڈرائیو کو تحریری شکل سے محفوظ ہے یا نہیں۔ اگر ایسا ہے تو ، تحفظ کو غیر فعال کریں </ li>\n<li> چیک کریں کہ پین ڈرائیو میں خالی جگہ ہے یا نہیں ۔ پین ڈرائیو سے ناپسندیدہ فائلوں کو حذف کریں</li>\n</ul>"
+    },
+    {
+      "topic": "میں نے اپنی پین ڈرائیو پر موجود مواد کو لوڈ کیا ، لیکن اب میں دیکھ رہا ہوں کہ یہ خالی ہے",
+      "description": "آپ کا پینڈرایو یا کمپیوٹر کسی وائرس سے متاثر ہوسکتا ہے۔چیک کریں کہ:\n* آپ کی مشین پر ایک اینٹی وائرس سوفٹویئر نصب ہے\n* آپ کی پینڈرائیو نامعلوم مشینوں میں پلگ کرنے سے پہلے تحریری طور پر محفوظ ہے"
+    },
+    {
+      "topic": "میرے پین ڈرائیو پر اور اس سے مواد کو کاپی کرنے میں وقت لگتا ہے",
+      "description": "کاپی کرنے میں جو وقت لیا گیا ہے اس کا انحصار مواد کی فائل کے سائز پر ہوتا ہے۔ کچھ بڑی درسی کتب کاپی کرنے میں وقت لگتا ہے۔ ہمارا مشورہ ہے کہ آپ اس عمل میں مداخلت نہ کریں۔ ایسا کرنے سے متضاد فائلیں پیدا ہوسکتی ہیں۔"
+    },
+    {
+      "topic": "میرے کمپیوٹر میں DIKSHA مشمولات کی وجہ سے کوئی خالی جگہ نہیں ہے",
+      "description": "اپنے کمپیوٹر پر جگہ خالی کرنے کے لئے ایپ کے میرے ڈاؤن لوڈ والے ٹیب سے ڈاؤن لوڈ کردہ مواد کو ہٹا دیں"
+    },
+    {
+      "topic": "میرے Ubuntu سسٹم پر DIKSHA ڈیسک ٹاپ ایپلی کیشن انسٹال کرنے سے قاصر ہے",
+      "description": "<p>میرے Ubuntu سسٹم پر DIKSHA ڈیسک ٹاپ ایپلی کیشن انسٹال کرنے کے لئے:</p>\n<p> اپنا ٹرمینل کھولیں </ p>\n<p> ڈائرکٹری تبدیل کرنے کے لئے سی ڈی کمانڈ چلائیں<مقام>جہاں exe فائل ڈاؤن لوڈ کی گئی ہے.مثال کے طور پر ، اگر ڈاؤن لوڈز فولڈر میں exe کو محفوظ کیا گیا ہے تو ، پھر سی ڈی ڈاؤن لوڈ کمانڈ چلائیں</p>\n<p>کمانڈ sudo dpkg-i چلائیں<filename>\n</p>\n<p> اس کمانڈ کو کامیابی کے ساتھ چلانے پر ایپلیکیشن لانچ کی جاتی ہے </ p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "حروف باقی ہیں",
+    "explainMsg": "کیا آپ اس مسئلے کو سمجھا سکے؟",
+    "faqMsg": "اکثر پوچھے گئے سوالات",
+    "help": "مدد",
+    "helpMsg": "کیا اس جواب نے آ پکی مدد کی؟",
+    "initiateEmailButton": "ای میل شروع کریں",
+    "knowMoreMsg": "آپ اور کیا جاننا چاہتے ہے؟",
+    "noMsg": "نہیں",
+    "reportIssue": "مسئلہ کی اطلاع دیں",
+    "reportIssueMsg": "دوسرے مسئلے کی اطلاع دیں",
+    "resolveMsg": "اپنے مسئلے کو حل کرنے کے لۓ فہرست دیکھیں",
+    "sorryMsg": "اس کے لئے معذرت!",
+    "submitButton": "جمع کریں",
+    "tellMoreMsg": "ہمیں اس مسئلے کے بارے میں مزید بتائیے",
+    "thanksMsg": "آپکے جواب کا شکریہ!",
+    "triggerEmailMsg": "ٹیکسٹ باکس میں تفصیلات شامل کرنے کے بعد اور ابتدائی ای میل بٹن کو شروع کرنے کے بعد، ہم آپ کی طرف سے ایک ای میل کو متحرک کریں گے. آپ مزید تفصیلات شامل کر سکتے ہیں اور / یا وہاں فائلیں منسلک کرسکتے ہیں.",
+    "typeHere": "یہاں ٹائپ کریں ...",
+    "yesMsg": "جی ہاں"
+  }
+}
\ No newline at end of file

From 0f69cc461ca73d69d5584cf95a86900cb034c2fd Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Fri, 11 Dec 2020 13:16:23 +0530
Subject: [PATCH 066/184] fix: adding missed job and updating branches (#2088)

---
 .../Core/jobs/OfflineInstaller/config.xml     | 108 ++++++++++++++++++
 .../Core/jobs/OfflineInstaller/config.xml     |   2 +-
 .../Core/jobs/UploadPortalLabel/config.xml    |   2 +-
 3 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
new file mode 100644
index 000000000..a68c1ef3a
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>5</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/OfflineInstaller</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>build_number</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+              <string>JenkinsJob</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>Build/Core/OfflineInstaller</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/artifacts/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
index 8c1f5a557..c05a06a6b 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
@@ -57,7 +57,7 @@
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.5.0</name>
+	  <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml
index 6c02e23d5..42e8c9e0e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml
@@ -166,7 +166,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.5.0</name>
+	  <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

From 9ec2430b1c299b081b5859b8c8365b1b07788204 Mon Sep 17 00:00:00 2001
From: harishkumar gangula <harish@sanketika.in>
Date: Fri, 11 Dec 2020 15:36:43 +0530
Subject: [PATCH 067/184] Issue #SB-21202 feat: Add all language faqs (#2087)

---
 utils/DesktopFAQ/faq-as.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-bn.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-en.json |  4 +--
 utils/DesktopFAQ/faq-gu.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-hi.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-kn.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-ml.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-mr.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-or.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-pa.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-ta.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-te.json | 68 ++++++++++++++++++++++++++++++++++++
 utils/DesktopFAQ/faq-ur.json | 68 ++++++++++++++++++++++++++++++++++++
 13 files changed, 818 insertions(+), 2 deletions(-)
 create mode 100644 utils/DesktopFAQ/faq-as.json
 create mode 100644 utils/DesktopFAQ/faq-bn.json
 create mode 100644 utils/DesktopFAQ/faq-gu.json
 create mode 100644 utils/DesktopFAQ/faq-hi.json
 create mode 100644 utils/DesktopFAQ/faq-kn.json
 create mode 100644 utils/DesktopFAQ/faq-ml.json
 create mode 100644 utils/DesktopFAQ/faq-mr.json
 create mode 100644 utils/DesktopFAQ/faq-or.json
 create mode 100644 utils/DesktopFAQ/faq-pa.json
 create mode 100644 utils/DesktopFAQ/faq-ta.json
 create mode 100644 utils/DesktopFAQ/faq-te.json
 create mode 100644 utils/DesktopFAQ/faq-ur.json

diff --git a/utils/DesktopFAQ/faq-as.json b/utils/DesktopFAQ/faq-as.json
new file mode 100644
index 000000000..243f8c5a4
--- /dev/null
+++ b/utils/DesktopFAQ/faq-as.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "মই মোৰ ব'ৰ্ড, মাধ্যম, শ্ৰেণী আৰু বিষয় চাব পৰা নাই",
+      "description": "আপোনাৰ ৰাজ্যই বৰ্তমান সকলো ব’ৰ্ড, মাধ্যম, শ্ৰেণী আৰু বিষয় সমৰ্থন নকৰে। আপোনাৰ ৰাজ্যই এইসমূহ যোগ কৰাৰ লগে লগেই, আপুনি তালিকা খনত এয়া দেখা পাব।"
+    },
+    {
+      "topic": "মই বিষয়বস্তু ডাউনল’ড কৰিলোঁ, কিন্তু মই এয়া চলাব পৰা নাই কাৰণ ইয়াত কোৱা হৈছে যে মোক ইণ্টাৰনেটৰ প্ৰয়োজন ",
+      "description": "আপুনি ইউটিউব কনটেণ্ট নিশ্চয় ডাউনল’ড কৰিলে। ইউটিউব কনটেণ্ট আপুনি কেৱল অনলাইন হৈ থকা অৱস্থাতহে চলাব পাৰিব। কম্পিউটাৰটো ইণ্টাৰনেটৰ সৈতে সংযোগ কৰক আৰু পুনৰ চেষ্টা কৰক।"
+    },
+    {
+      "topic": "মই মোৰ DIKSHA ডেস্কটপ এপটো আপডেট কৰাৰ প্ৰয়োজন হৈছে",
+      "description": "আপোনাৰ কম্পিউটাৰটো ইণ্টাৰনেটৰ সৈতে সংযোগ কৰক আৰু শেহতীয়া এপ সংস্কৰণৰ বাবে https://staging.sunbirded.org/desktop/latest পৰীক্ষা কৰক"
+    },
+    {
+      "topic": "ইণ্টাৰনেট সংযোগ থকা লেপটপৰ সৈতে মোৰ প্ৰৱেশাধিকাৰ নাই, কিন্তু মই ডেস্কটপ এপত বিষয়বস্তু যোগ দিব আৰু আপডেট কৰিব বিচাৰোঁ",
+      "description": "যদি আপোনাৰ এটা ম’বাইল ফোন আছে, তেন্তে গুগল প্লে’ষ্ট’ৰৰ পৰা DIKSHA ম’বাইল এপটো ডাউনল’ড কৰক।\nএপটোত বিষয়বস্তুৰ বাবে ব্ৰাউজ কৰক।\nDIKSHA লাইব্ৰেৰীৰ পৰা বিষয়বস্তু ডাউনল’ড কৰক।\nএয়া এটা পে’নড্ৰাইভ বা SD কাৰ্ডলৈ ক’পি কৰক আৰু ইয়াক DIKSHA ডেস্কটপ এপত আপল’ড কৰক।"
+    },
+    {
+      "topic": "মই এটা বিশেষ বিষয়ৰ বাবে বিষয়বস্তু বিচাৰি পোৱা নাই, নতুবা মই অপ্ৰাসংগিক বিষয়বস্তু বিচাৰি পাইছোঁ",
+      "description": "বিষয়বস্তুৰ সন্ধান কৰিবলৈ DIKSHAৰ অনলাইন লাইব্ৰেৰী ব্ৰাউজ কৰক। তেতিয়াও যদি এয়া উপলব্ধ নোহোৱাকৈ থাকে, তেন্তে বিষয়বস্তু সম্পৰ্কে আপোনাৰ মতামত ৰাজ্যিক SCERTলৈ প্ৰেৰণ কৰক"
+    },
+    {
+      "topic": "এপটো বৰ লেহেমীয়া গতিৰ",
+      "description": "এপটোৰ কাৰ্যকাৰিতা দ্ৰুত কৰিবলৈ, নিম্নোক্তসমূহ কৰক:\n<br>আপোনাৰ কম্পিউটাৰৰ ছিষ্টেম কনফিগাৰেচনলৈ যাওক। ন্যূনতম কনফিগাৰেচন হ’ব লাগে:\n<li>2 GB RAM</li><ul><li>2 GB RAM</li>\n<li>ডুৱেল ক’ৰ প্ৰচেছৰ</li></ul>\n<br>যদিহে আপোনাৰ কম্পিউটাৰ এই কনফিগাৰেচনৰ সৈতে মিলে বা অতিক্ৰম কৰে, এপটো পুনৰ আৰম্ভ কৰক।\n<br>এইটো কৰাৰ পাছত, যদিহে তেতিয়াও ই মন্থৰ হৈ থাকে তেতিয়া <b>Task Manager</b>লৈ যাওক,\nসকলো অব্যৱহৃত বেকগ্ৰাউণ্ড প্ৰক্ৰিয়া বাছনি কৰক আৰু <b>End Task</b>ত ক্লিক কৰক"
+    },
+    {
+      "topic": "মই পে’নড্ৰাইভলৈ বিষয়বস্তু ক’পি কৰিব পৰা নাই",
+      "description": "বিষয়বস্তুটো পে’ন ড্ৰাইভলৈ ক’পি কৰিবলৈ, তলত দিয়াবোৰ কৰক:\n<ul><li>কম্পিউটাৰৰ চেটিংছলৈ যাওক। USB ড্ৰাইভটো ৰাইট কৰাৰ বাবে সুৰক্ষিত হয়নে নহয় পৰীক্ষা কৰক। যদিহে হয়, সুৰক্ষা নিষ্ক্ৰিয় কৰক </li>\n<li>পে’ন ড্ৰাইভটোত খালি ঠাই আছেনে নাই পৰীক্ষা কৰক। পে’ন ড্ৰাইভটোৰ পৰা অদৰকাৰী ফাইলবোৰ ডিলিট কৰক</li></ul>"
+    },
+    {
+      "topic": "মই পে’নড্ৰাইভত বিষয়বস্তু ভৰালোঁ, কিন্তু এতিয়া মই দেখিছোঁ যে এইটো খালি হৈ আছে",
+      "description": "আপোনাৰ পে’ন ড্ৰাইভ বা কম্পিউটাৰ ভাইৰাছৰদ্বাৰা আক্ৰান্ত হ’ব পাৰে। এয়া পৰীক্ষা কৰক:\n* আপোনাৰ মেচিনত এটা এণ্টি ভাইৰাছ ছফটৱেৰ ইনষ্টল হৈ আছে\n* অচিনাকী মেচিনত আপুনি সংযুক্ত কৰাৰ আগতে আপোনাৰ পে’নড্ৰাইভটো ৰাইট কৰাৰ বাবে সুৰক্ষিত হ’ব লাগিব"
+    },
+    {
+      "topic": "মোৰ পে’নড্ৰাইভলৈ বা পে’নড্ৰাইভৰ পৰা বিষয়বস্তু ক’পি কৰোঁতে সময় লাগে",
+      "description": "ক’পি কৰিবলৈ লগা সময় বিষয়বস্তুটোৰ ফাইলৰ আকাৰৰ ওপৰত নিৰ্ভৰ কৰে। কিছুমান বৃহৎ আকাৰৰ পাঠ্যপুথি ক’পি কৰোঁতে সময় লাগে। আমি পৰামৰ্শ দিও যে আপুনি প্ৰক্ৰিয়াটো মাজতে বন্ধ কৰি নিদিব। এনে কৰাৰ ফলত ফাইলবোৰ সংগতিহীন হৈ পৰিব। "
+    },
+    {
+      "topic": "DIKSHAৰ বিষয়বস্তুৰ বাবে মোৰ কম্পিউটাৰত কোনো খালি ঠাই নাই",
+      "description": "আপোনাৰ কম্পিউটাৰত ঠাই খালি কৰিবলৈ এপটোৰ মাই ডাউনল’ডছ্ টেবটোৰ পৰা ডাউনল’ড হৈ থকা বিষয়বস্তু ডিলিট কৰক"
+    },
+    {
+      "topic": "মোৰ উবান্তু ছিষ্টেমত DIKSHA ডেস্কটপ এপ্লিকেশ্বন ইনষ্টল কৰিব পৰা নাই",
+      "description": "<p>আপোনাৰ উবান্তু ছিষ্টেমত DIKSHA ডেস্কটপ এপ্লিকেশ্বন ইনষ্টল কৰিবলৈ:</p>\n<p>1) আপোনাৰ টাৰ্মিনেল খোলক</p>\n<p>2) exe ফাইলটো য’ত ডাউনল’ড হৈছে তাত নামপঞ্জী সলনি কৰিবলৈ cd <location> নিৰ্দেশটো চলাওক। উদাহৰণস্বৰূপে, যদি exe ডাউনল’ড ফ’ল্ডাৰত ছে’ভ হৈ আছে, তেন্তে cd Downloads নিৰ্দেশটো চলাওক</p>\n<p>3) sudo dpkg -i <filename> নিৰ্দেশটো চলাওক</p>\n<p>এই নিৰ্দেশটো সফলতাৰে চলালে এপ্লিকেশ্বনটো আৰম্ভ হয়</p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "থাকি যোৱা আখৰসমূহ",
+    "explainMsg": "অসুবিধাটো বৰ্ণনা কৰিব পাৰিবনে ?",
+    "faqMsg": "সঘনাই সোধা প্ৰশ্নসমূহ",
+    "help": "সহায়",
+    "helpMsg": "এই উত্তৰটোৱে আপোনাক সহায় কৰিলেনে ?",
+    "initiateEmailButton": "ইমেইল আৰম্ভ কৰক",
+    "knowMoreMsg": "আপুনি আৰু কিবা জানিব খুজিছে?",
+    "noMsg": "নহয়",
+    "reportIssue": "সমস্যা এটা উত্থাপন কৰক",
+    "reportIssueMsg": "অন্য এটা সমস্যা উত্থাপন কৰক",
+    "resolveMsg": "আপোনাৰ অসুবিধাটো সমাধান কৰিবলৈ তালিকাখন চাওক",
+    "sorryMsg": "সেইটোৰ বাবে দুঃখিত!",
+    "submitButton": "প্ৰদান কৰক",
+    "tellMoreMsg": "আপুনি সন্মুখীন হোৱা অসুবিধাটোৰ বিষয়ে আমাক অলপ বেছিকৈ জনাওক",
+    "thanksMsg": "আপোনাৰ সঁহাৰিৰ বাবে ধন্যবাদ !",
+    "triggerEmailMsg": "আপুনি টেক্সট্ বক্সত সবিশেষ যোগ দিয়া আৰু ইমেইল যোগাযোগৰ সুচনা আৰম্ভ কৰা বাটনত টিপাৰ পাছত, আমি আপোনাৰ হৈ এখন ইমেইল পঠাম। আপুনি তাত অধিক সবিশেষ যোগ দিব আৰু / বা ফাইল সংলগ্ন কৰিব পাৰিব।",
+    "typeHere": "ইয়াত লিখক...",
+    "yesMsg": "হয়"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-bn.json b/utils/DesktopFAQ/faq-bn.json
new file mode 100644
index 000000000..9bf1afd2e
--- /dev/null
+++ b/utils/DesktopFAQ/faq-bn.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "আমি আমার বোর্ড, মিডিয়াম বা মাধ্যম, ক্লাস ও বিষয় দেখতে পাচ্ছি না",
+      "description": "আপনার রাজ্য বর্তমানে সবধরনের বোর্ড, মিডিয়াম, ক্লাস ও বিষয়গুলি পড়ানোর সুযোগ প্রদান করছে না। যত তাড়াতাড়ি আপনার রাজ্য সেগুলি অন্তর্ভুক্ত করবে সেই অনুযায়ী আপনি সেগুলি তালিকায় দেখতে পাবেন।"
+    },
+    {
+      "topic": "আমি বিষয়বস্তুটি ডাউনলোড করেছি, কিন্তু আমি এটি চালু করতে পারছি না কারণ এখানে বলা হচ্ছে আমার ইন্টারনেট সংযোগ থাকা প্রয়োজন",
+      "description": "আপনি YouTube-এর বিষয়বস্তু ডাউনলোড করে থাকতে পারেন। শুধুমাত্র অনলাইন থাকার সময় আপনি YouTube-এর বিষয়বস্তু চালাতে পারবেন। আপনার কম্পিউটারটি ইন্টারনেটের সাথে যুক্ত করে আবার চেষ্টা করুন।"
+    },
+    {
+      "topic": "আমার DIKSHA ডেস্কটপ অ্যাপটি আপডেট করা প্রয়োজন",
+      "description": "আপনার কম্পিউটারটি ইন্টারনেটের সঙ্গে যুক্ত করুন ও সাম্প্রতিকতম অ্যাপ সংস্করণটির জন্য https://staging.sunbirded.org/desktop/latest চেক করুন"
+    },
+    {
+      "topic": "ইন্টারনেট সংযোগ সহ কোনও ল্যাপটপে আমার অ্যাকসেস নেই, কিন্তু আমার ডেস্কটপ অ্যাপে আমি বিষয়বস্তু যোগ করতে বা আপডেট করতে চাই",
+      "description": "যদি আপনার কোনো মোবাইল ফোন থাকে তবে DIKSHA মোবাইল অ্যাপটি google playstore থেকে ডাউনলোড করুন।\nঅ্যাপটির মধ্যে বিষয়বস্তুটি ব্রাউজ করুন।\nবিষয়বস্তুটি DIKSHA লাইব্রেরী থেকে ডাউনলোড করুন।\nএটিকে কোনও পেনড্রাইভ বা SD কার্ডে কপি করুন ও DIKSHA ডেস্কটপ অ্যাপে সেটি আপলোড করুন।"
+    },
+    {
+      "topic": "আমি একটি নির্দিষ্ট প্রসঙ্গের ওপর বিষয়বস্তু খুঁজে পাচ্ছি না, অথবা আমি দেখছি বিষয়বস্তুটি অপ্রাসঙ্গিক",
+      "description": "নির্দিষ্ট বিষয়বস্তু খুঁজে পেতে DIKSHA-এর অনলাইন লাইব্রেরীতে ব্রাউজ করুন। যদি তারপরেও আপনি খুঁজে না পান তবে বিষয়বস্তু সম্পর্কে আপনার ফিডব্যাক বা প্রতিক্রিয়া রাজ্য SCERT-এর কাছে পাঠান"
+    },
+    {
+      "topic": "এই অ্যাপটি খুবই ধীরে কাজ করে",
+      "description": "অ্যাপটির কার্যক্ষমতার গতি বৃদ্ধি করতে, নিম্নলিখিত পদ্ধতিটি অনুসরণ করুন:\n<br>আপনার কম্পিউটারের সিস্টেম কনফিগারেশনে যান। নূন্যতম কনফিগারেশন হওয়া প্রয়োজন:\n<ul><li>2 GB RAM</li>\n<li>ডুয়েল কোর প্রসেসর</li></ul>\n<br>যদি আপনার কম্পিউটারে এই বা এর থেকে উন্নত কনফিগারেশন থাকে তবে অ্যাপটি রিস্টার্ট করুন।\n<br>এটি করার পরেও, যদি অ্যাপটি ধীরে কাজ করে তবে <b>টাস্ক ম্যানেজারে</b> যান, সব অব্যবহৃত ব্যাকগ্রাউন্ড প্রসেসগুলি নির্বাচন করুন ও <b>এন্ড টাস্কে</b> ক্লিক করুন"
+    },
+    {
+      "topic": "আমি একটি পেনড্রাইভে বিষয়বস্তু কপি করতে পারছি না",
+      "description": "একটি পেন ড্রাইভে কোনও বিষয়বস্তু কপি করার জন্য নিম্নলিখিত পদ্ধতিটি অনুসরণ করুন:\n<ul><li>আপনার কম্পিউটার সেটিংসে যান। USB ড্রাইভটি রাইট-প্রোটেক্টেড কিনা সেটি চেক করুন। যদি রাইট-প্রোটেক্টেড হয়, প্রোটেকশনটি নিষ্ক্রিয় করুন</li>\n<li>পেন ড্রাইভটিতে খালি জায়গা আছে কিনা তা চেক করুন। পেন ড্রাইভ থেকে অপ্রয়োজনীয় ফাইলগুলি ডিলিট করুন</li></ul>"
+    },
+    {
+      "topic": "আমার পেনড্রাইভে আমি বিষয়বস্তু লোড করেছিলাম, কিন্তু এখন দেখছি সেটি খালি",
+      "description": "আপনার কম্পিউটার বা পেনড্রাইভটিতে ভাইরাস থাকতে পারে, চেক করুন যে:\n\n*আপনার কম্পিউটারে কোনও অ্যান্টি ভাইরাস সফ্টওয়্যার ইনস্টল করা আছে কিনা\n*কোনও অজানা কম্পিউটারে লাগানোর আগে আপনার পেনড্রাইভটি রাইট-প্রোটেক্টেড করা আছে কিনা"
+    },
+    {
+      "topic": "আমার পেনড্রাইভ থেকে ও সেটিতে বিষয়বস্তু কপি হতে সময় লাগছে",
+      "description": "ফাইলটির আকারের ওপর নির্ভর করে যে ফাইলটি কপি হতে কত সময় লাগবে। বড় টেক্সটবুকগুলি কপি হতে বেশি সময় লাগে। আমরা সুপারিশ করব প্রক্রিয়াটি চলাকালীন মাঝপথে সেটি বন্ধ করবেন না। সেটি করলে কপি হওয়া ফাইলটিতে ত্রুটি থেকে যেতে পারে।"
+    },
+    {
+      "topic": "DIKSHA-এর বিষয়বস্তু রাখার কারণে আমার কম্পিউটারে খালি জায়গা নেই।",
+      "description": "ডাউনলোড করা বিষয়বস্তু অ্যাপটির মাই ডাউনলোড ট্যাব থেকে ডিলিট করে আপনার কম্পিউটারে জায়গা খালি করুন।"
+    },
+    {
+      "topic": "আমার উবানটু সিস্টেমে DIKSHA ডেস্কটপ অ্যাপটি ইনস্টল করা যাচ্ছে না",
+      "description": "<p>আপনার উবান্টু সিস্টেমে DIKSHA ডেস্কটপ অ্যাপ্লিকেশন ইনস্টল করতে:</p>\n<p>1) আপনার টার্মিনালটি খুলুন</p>\n<p>2) যেখানে এক্সটেনসন ফাইলটি ডাউনলোড করা হয়েছে সেখানে ডিরেক্টরিটি পরিবর্তন করতে কম্যান্ডটি cd <location> টাইপ করে চালু করুন। উদাহরণস্বরূপ, যদি এক্সটেনসন ফাইলটি ডাউনলোড ফোল্ডারে সংরক্ষণ করা থাকে, তবে কম্যান্ডটি cd Download টাইপ করে চালু করুন</p>\n<p>3) sudo dpkg -i <filename> টাইপ করে কম্যান্ডটি চালু করুন</p>\n<p>এই কম্যান্ডটি সফলভাবে চালু হওয়াতে অ্যাপ্লিকেশনটি চালু হয়েছে </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "অক্ষর বাকি",
+    "explainMsg": "আপনি কি সমস্যা টি ব্যাখ্যা করতে পারবেন?",
+    "faqMsg": "সচরাচর জিজ্ঞাস্য",
+    "help": "সাহায্য ",
+    "helpMsg": "এই উত্তরটি আপনাকে সাহায্য করেছিল?",
+    "initiateEmailButton": "ইমেইল পাঠান\n",
+    "knowMoreMsg": "আপনি আর কি জানতে চান?",
+    "noMsg": "না",
+    "reportIssue": "সমস্যা রিপোর্ট করুন",
+    "reportIssueMsg": "অন্যান্য সমস্যা গুলি রিপোর্ট করুন",
+    "resolveMsg": "আপনার সমস্যা সমাধানের জন্য তালিকা টি দেখুন",
+    "sorryMsg": "এর জন্যে দুঃখিত!",
+    "submitButton": "জমা দিন",
+    "tellMoreMsg": "আপনি যে সমস্যার সম্মুখীন হয়েছেন তার সম্পর্কে আমাদের আরো বলুন",
+    "thanksMsg": "আপনার প্রতিক্রিয়ার জন্য ধন্যবাদ!",
+    "triggerEmailMsg": "আপনি টেক্সট বাক্সে বিশদ যুক্ত করার পরে, ইনিশিয়েটিভ ইমেল বোতামটি তে ক্লিক করুন, আমরা আপনার হয়ে একটি ইমেল ট্রিগার করব। আপনি আরও বিস্তারিত যোগ করতে পারেন এবং/ অথবা সংযুক্ত ফাইল যোগ করতে পারেন",
+    "typeHere": "এখানে লিখুন...",
+    "yesMsg": "হ্যাঁ "
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-en.json b/utils/DesktopFAQ/faq-en.json
index e5b3bbdb6..413c849e6 100644
--- a/utils/DesktopFAQ/faq-en.json
+++ b/utils/DesktopFAQ/faq-en.json
@@ -10,7 +10,7 @@
     },
     {
       "topic": "I need to update my DIKSHA desktop app",
-      "description": "Connect your computer to the Internet and check https://diksha.gov.in/desktop/latest for the latest app version "
+      "description": "Connect your computer to the Internet and check https://staging.sunbirded.org/desktop/latest for the latest app version "
     },
     {
       "topic": "I do not have access to a laptop with an Internet connection, but I want to add or update content on the desktop app",
@@ -65,4 +65,4 @@
     "typeHere": "Type Here...",
     "yesMsg": "Yes"
   }
-}
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-gu.json b/utils/DesktopFAQ/faq-gu.json
new file mode 100644
index 000000000..9410f95a4
--- /dev/null
+++ b/utils/DesktopFAQ/faq-gu.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "હું મારું બોર્ડ, માધ્યમ, વર્ગ અને વિષય જોઈ શકતો નથી",
+      "description": "તમારું રાજ્ય હાલમાં બધા બોર્ડ, માધ્યમો, વર્ગો અને વિષયોને સપોર્ટ કરતું નથી. જલદી તમારું રાજ્ય તેમને ઉમેરશે, તમે તેને સૂચિમાં જોશો"
+    },
+    {
+      "topic": "મેં કન્ટેન્ટ ડાઉનલોડ કરું છે, પરંતુ હું તે ચલાવવામાં અસમર્થ છું કારણ કે તે કહે છે કે મને ઇન્ટરનેટની જરૂર છે",
+      "description": "તમે યુટ્યુબ કન્ટેન્ટ ડાઉનલોડ કરી હશે. તમે ઓનલાઇન હોવ ત્યારે જ તમે યુટ્યુબ સામગ્રી ચલાવી શકો છો. કમ્પ્યુટરને ઇન્ટરનેટથી કનેક્ટ કરો ફરીથી પ્રયાસ કરો."
+    },
+    {
+      "topic": "મારે મારી DIKSHA ડેસ્કટોપ એપ્લિકેશનને અપડેટ કરવાની જરૂર છે",
+      "description": "તમારા કમ્પ્યુટરને ઇન્ટરનેટથી કનેક્ટ કરો અને નવીનતમ એપ્લિકેશન સંસ્કરણ માટે https://staging.sunbirded.org/desktop/latest તપાસો.\n"
+    },
+    {
+      "topic": "મને ઇન્ટરનેટ કનેક્શનવાળા લેપટોપની ઍક્સેસ નથી, પરંતુ હું ડેસ્કટોપ એપ્લિકેશન પર સામગ્રી ઉમેરવા અથવા અપડેટ કરવા માંગું છું",
+      "description": "જો તમારી પાસે મોબાઈલ ફોન છે, તો ગૂગલ પ્લે સ્ટોર પરથી DIKSHA મોબાઇલ એપ્લિકેશન ડાઉનલોડ કરો. એપ્લિકેશનમાંની સામગ્રી માટે બ્રાઉઝ કરો. DIKSHA લાઇબ્રેરીમાંથી સામગ્રી ડાઉનલોડ કરો. તેને પેનડ્રાઇવ અથવા એસડી કાર્ડ પર કોપી કરો અને તેને DIKSHA ડેસ્કટોપ એપ્લિકેશન પર અપલોડ કરો."
+    },
+    {
+      "topic": "મને કોઈ ખાસ વિષય માટે સામગ્રી મળી નથી, અથવા મને સામગ્રી અપ્રસ્તુત લાગે છે\n",
+      "description": "કન્ટેન્ટ શોધવા માટે DIKSHAની ઓનલાઇન લાઇબ્રેરી બ્રાઉઝ કરો. જો તે હજી અનુપલબ્ધ છે, તો કન્ટેન્ટ વિશેનો પ્રતિસાદ રાજ્ય SCERTને મોકલો"
+    },
+    {
+      "topic": "એપ્લિકેશન ખૂબ ધીમી છે",
+      "description": "એપ્લિકેશન પ્રદર્શનને ઝડપી બનાવવા માટે, નીચે આપેલા કાર્યો કરો: <br> તમારા કમ્પ્યુટરની સિસ્ટમ ગોઠવણી પર જાઓ. લઘુત્તમ ગોઠવણી આ હોવી જોઈએ: \n<ul>\n <li> 2 જીબી રેમ </li>\n <li> ડ્યુઅલ કોર પ્રોસેસર </li>\n </ul> \n<br> જો તમારું કમ્પ્યુટર આ ગોઠવણીથી મેળ ખાય છે અથવા ઓળંગાઈ ગયું છે, તો એપ્લિકેશનને ફરીથી પ્રારંભ કરો. \n<br> આ કર્યા પછી, જો તે હજી ધીમું છે, તો <b> ટાસ્ક મેનેજર </b> પર જાઓ, બધી ન વપરાયેલી પૃષ્ઠભૂમિ પ્રક્રિયાઓ પસંદ કરો અને <b> કાર્ય સમાપ્ત કરો </b> ક્લિક કરો."
+    },
+    {
+      "topic": "હું પેનડ્રાઇવ પર કન્ટેન્ટની કોપી કરવામાં અસમર્થ છું",
+      "description": "પેન ડ્રાઇવ પરની સામગ્રીની કોપી કરવા માટે, નીચેની વિગતો કરો: \n<ul>\n <li> તમારા કમ્પ્યુટર સેટિંગ્સ પર જાઓ. યુએસબી ડ્રાઇવ લખવા સુરક્ષિત છે કે કેમ તે તપાસો. જો તે છે, તો સુરક્ષાને બંધ કરો </li> \n<li> પેન ડ્રાઇવમાં ખાલી જગ્યા છે કે કેમ તે તપાસો. પેનડ્રાઈવેમાં જે ફાઇલો જરૂરી નથી તેને કાઢી નાખો </li> \n</ul>"
+    },
+    {
+      "topic": "મારી પેનડ્રાઈવ પર મેં કન્ટેન્ટ લોડ કરી હતી, પરંતુ હવે હું જોઉં છું કે તે ખાલી છે",
+      "description": "તમારું પેનડ્રાઇવ અથવા કમ્પ્યુટર વાયરસથી ચેપ લાગ્યું છે. તે તપાસો:\n * તમારી પાસે તમારા મશીન પર એન્ટી વાયરસ સોફ્ટવેર ઇન્સ્ટોલ કરેલું છે .\n* તમારા પેનડ્રાઇવને તમે અજાણ્યા મશીનોમાં પ્લગ કરતાં પહેલાં તે લખાણ સુરક્ષિત છે."
+    },
+    {
+      "topic": "મારા પેનડ્રાઇવ પર અને તેની કન્ટેન્ટની કોપી કરવામાં સમય લાગે છે",
+      "description": "કોપી કરવા માટે લેવાયેલ સમય સામગ્રી ફાઇલના કદ પર આધારિત છે. કેટલાક મોટા પાઠયપુસ્તકોની કોપી કરવામાં સમય લે છે. અમે ભલામણ કરીએ છીએ કે તમે પ્રક્રિયા વચ્ચે ન રોકો. આમ કરવાથી અસંગત ફાઇલો થઈ શકે છે."
+    },
+    {
+      "topic": "DIKSHA સામગ્રીને કારણે મારા કમ્પ્યુટર પાસે કોઈ ખાલી જગ્યા નથી",
+      "description": "તમારા કમ્પ્યુટર પર જગ્યા ખાલી કરવા માટે એપ્લિકેશનના મારા ડાઉનલોડ ટેબ પરથી ડાઉનલોડ કરેલી સામગ્રી ડીલીટ નાખો"
+    },
+    {
+      "topic": "મારી ઉબુન્ટુ સિસ્ટમ પર DIKSHA ડેસ્કટોપ એપ્લિકેશન ઇન્સ્ટોલ કરવામાં અસમર્થ",
+      "description": "<p> તમારી ઉબુન્ટુ સિસ્ટમ પર DIKSHA ડેસ્કટોપ એપ્લિકેશનને ઇન્સ્ટોલ કરવા માટે: </p> \n<p> 1) તમારું ટર્મિનલ ખોલો </p>\n <p> 2) ડિરેક્ટરીને બદલવા માટે cd <location> આદેશ ચલાવો જ્યાં એક્સેપ્ ફાઇલ ડાઉનલોડ થયેલ છે. ઉદાહરણ તરીકે, જો એક્સેલ ડાઉનલોડ્સ ફોલ્ડરમાં સાચવવામાં આવે છે, તો પછી સીડી ડાઉનલોડ્સ આદેશ ચલાવો </p> \n<p> 3) sudo dpkg -i <filename></p> \n<p> આ આદેશ સફળતાપૂર્વક ચલાવવા પર એપ્લિકેશન શરૂ થઈ છે </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "અક્ષરો બાકી છે.",
+    "explainMsg": "શું તમે સમસ્યા સમજાવી શકો છો?",
+    "faqMsg": "વારંવાર પૂછાતા પ્રશ્નો",
+    "help": "મદદ કરો",
+    "helpMsg": "શું આ જવાબ તમને મદદ કરશે?",
+    "initiateEmailButton": "ઇમેઇલ શરૂ કરો",
+    "knowMoreMsg": " શું તમે વધુ માહિતી જાણવા માંગો છો?",
+    "noMsg": "ના",
+    "reportIssue": "સમસ્યાની જાણ કરો.",
+    "reportIssueMsg": "અન્ય સમસ્યાની જાણ કરો.",
+    "resolveMsg": "તમારી સમસ્યાનું નિરાકરણ લાવવા યાદી જુઓ",
+    "sorryMsg": "તે વિશે માફ કરશો!",
+    "submitButton": "સબમિટ કરો",
+    "tellMoreMsg": "તમે જે સમસ્યાનો સામનો કર્યો હતો તેના વિશે અમને વધુ કહો",
+    "thanksMsg": "તમારી પ્રતિક્રિયા બદલ આભાર!",
+    "triggerEmailMsg": "તમે ટેક્સ્ટ બોક્સમાં વિગતો ઉમેરો અને ઇનિશિએટ ઇ-મેઇલ બટન પર ટેપ કરો પછી, અમે તમારા વતી એક ઇ-મેઇલ ટ્રિગર કરીશું. તમે ત્યાં વધુ વિગતો ઉમેરી શકો છો અને / અથવા ફાઇલો જોડી શકો છો.",
+    "typeHere": "અહી લખો...",
+    "yesMsg": "હા"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-hi.json b/utils/DesktopFAQ/faq-hi.json
new file mode 100644
index 000000000..9736c8cfc
--- /dev/null
+++ b/utils/DesktopFAQ/faq-hi.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "मैं अपना बोर्ड, माध्यम, कक्षा और विषय नहीं देख सकता",
+      "description": "आपका राज्य वर्तमान में सभी बोर्डों, माध्यमों, कक्षाओं और विषयों का समर्थन नहीं करता है । जैसे ही आपका राज्य उन्हें जोड़ता है, आप इसे सूची में देखेंगे"
+    },
+    {
+      "topic": "मैंने कंटेन्ट डाउनलोड की है, लेकिन मैं इसे खोलने में असमर्थ हूं क्योंकि यह कहता है कि मुझे इंटरनेट की आवश्यकता है",
+      "description": "हो सकता है आपने YouTube कंटेन्ट डाउनलोड कर ली होगी। आप YouTube कंटेन्ट तभी तक खोल सकते हैं जब आप ऑनलाइन हों। कंप्यूटर को फिर से इंटरनेट से कनेक्ट करने का प्रयास करें।"
+    },
+    {
+      "topic": "मुझे अपने दीक्षा डेस्कटॉप ऐप को अपडेट करने की आवश्यकता है",
+      "description": "अपने कंप्यूटर को इंटरनेट से कनेक्ट करें और नवीनतम ऐप संस्करण के लिए https://staging.sunbirded.org/desktop/latest देखें"
+    },
+    {
+      "topic": "मेरे पास इंटरनेट कनेक्शन वाले लैपटॉप का अभिगम नहीं है, लेकिन मैं डेस्कटॉप ऐप पर कंटेन्ट जोड़ना या अपडेट करना चाहता हूं",
+      "description": "अगर आपके पास मोबाइल फोन है तो गूगल प्लेस्टोर से दीक्षा मोबाइल एप डाउनलोड करें।\nऐप में कंटेन्ट के लिए ब्राउज़ करें।\nदीक्षा पुस्तकालय से कंटेन्ट डाउनलोड करें।\nइसे पेनड्राइव या एसडी कार्ड पर कॉपी करें और दीक्षा डेस्कटॉप ऐप पर अपलोड करें।"
+    },
+    {
+      "topic": "मुझे किसी विशेष विषय के लिए कंटेन्ट नहीं मिलती है, या मुझे कंटेन्ट अप्रासंगिक लगती है",
+      "description": "सामग्री की खोज के लिए दीक्षा की ऑनलाइन लाइब्रेरी ब्राउज़ करें। यदि यह अभी भी अनुपलब्ध है, तो सामग्री के बारे में अपनी प्रतिक्रिया राज्य SCERT को भेजें"
+    },
+    {
+      "topic": "ऐप बहुत धीमा है",
+      "description": "ऐप प्रदर्शन को गति देने के लिए, निम्नलिखित करें:\n<br>अपने कंप्यूटर के सिस्टम कॉन्फ़िगरेशन पर जाएं। न्यूनतम विन्यास होना चाहिए:\n<ul><li>2 जीबी रैम</li>\n<li>ड्यूल कोर प्रोसेसर</li></ul>\n<br>यदि आपका कंप्यूटर इस विन्यास से मेल खाता है या उससे अधिक है, तो ऐप को फिर से शुरू करें।\n<br>ऐसा करने के बाद, यदि यह अभी भी धीमा है, तो <b>टास्क मैनेजर</b> पर जाएं,\nसभी अप्रयुक्त पृष्ठभूमि प्रक्रियाओं का चयन करें और <b>एंड टास्क</b> पर क्लिक करें"
+    },
+    {
+      "topic": "मैं पेनड्राइव में कंटेन्ट की प्रतिलिपि बनाने में असमर्थ हूं",
+      "description": "कंटेन्ट को पेन ड्राइव पर कॉपी करने के लिए, निम्नलिखित करें:\n<ul><li>अपने कंप्यूटर सेटिंग पर जाएं। जांच करें कि USB ड्राइव लिखने से संरक्षित है या नहीं। यदि ऐसा है, तो सुरक्षा को अक्षम करें</li>\n<li>चेक करें कि पेन ड्राइव में खाली जगह है या नहीं। पेनड्राइव से अवांछित फ़ाइलों को हटाएं</li></ul>"
+    },
+    {
+      "topic": "मैंने अपने पेनड्राइव पर कंटेन्ट लोड की थी, लेकिन अब मैं देख रहा हूं कि यह खाली है",
+      "description": "आपका पेनड्राइव या कंप्यूटर वायरस से संक्रमित हो सकता है। जाँच करें कि:\n* आपके पास एक एंटी वायरस सॉफ़्टवेयर है जो आपकी मशीन पर स्थापित है\n* अज्ञात मशीनों में आपका पेनड्राइव प्लग करने से पहले लिखनें से सुरक्षित है।"
+    },
+    {
+      "topic": "मेरे पेनड्राइव से और में कंटेन्ट को कॉपी करने में समय लगता है",
+      "description": "कॉपी करने के लिए लिया गया समय कंटेन्ट फ़ाइल के आकार पर निर्भर करता है। कुछ बड़ी पाठ्यपुस्तकों को कॉपी करने में समय लगता है। हमारा सुझाव है कि आप इस प्रक्रिया को बीच में न रोकें। ऐसा करने से असंगत फ़ाइलें बन सकती हैं।"
+    },
+    {
+      "topic": "DIKSHA कंटेन्ट के कारण मेरे कंप्यूटर में खाली जगह नहीं है",
+      "description": "अपने कंप्यूटर पर जगह खाली करने के लिए ऐप के माई डाउनलोड टैब से डाउनलोड की गई कंटेन्ट को हटाएं"
+    },
+    {
+      "topic": "मेरे Ubuntu सिस्टम पर दीक्षा डेस्कटॉप एप्लिकेशन इंस्टॉल करने में असमर्थ",
+      "description": "<p> अपने ubuntu सिस्टम पर DIKSHA डेस्कटॉप एप्लिकेशन इंस्टॉल करने के लिए: </ p>\n<p> 1) अपना टर्मिनल खोलें </p>\n<p> 2) निर्देशिका को बदलने के लिए कमांड सीडी <स्थान> को चलाएँ जहाँ एक्स फ़ाइल है डाउनलोड किया गया है। उदाहरण के लिए, यदि exe डाउनलोड फ़ोल्डर में सहेजा गया है, तो कमांड cd डाउनलोड चलाएं </p>\n<p> 3) कमांड sudo dpkg -i चलाएं <filename> </p>\n<p> सफलतापूर्वक इस कमांड को चलाने पर एप्लिकेशन लॉन्च किया गया है </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "अक्षर बाकी",
+    "explainMsg": "आपकी समस्या हमें विस्तार में बतायें",
+    "faqMsg": "अक्सर पूछे जाने वाले प्रश्न",
+    "help": "सहायता",
+    "helpMsg": "क्या आप इस उत्तर से संतुष्ट हैं?",
+    "initiateEmailButton": "ईमेल भेजें",
+    "knowMoreMsg": "आप कोई और जानकारी चाहते हैं?",
+    "noMsg": "नहीं",
+    "reportIssue": "समस्या रिपोर्ट करें",
+    "reportIssueMsg": "अन्य समस्या रिपोर्ट करें",
+    "resolveMsg": "अपनी समस्या का हल सूची में देखें",
+    "sorryMsg": "क्षमा करें!",
+    "submitButton": "दाख़िल करें",
+    "tellMoreMsg": "आपकी समस्या हमें विस्तार में बतायें",
+    "thanksMsg": "आपकी प्रतिक्रिया के लिए धन्यवाद",
+    "triggerEmailMsg": "आप अपना विवरण भर कर, 'ईमेल आरम्भ करें' का बटन दबायें। हम आपकी ओर से ईमेल ट्रिगर करेंगे| आप इस ईमेल में अधिक विवरण व संलग्न जोड़ सकते है।",
+    "typeHere": "यहाँ टाइप करें...",
+    "yesMsg": "हाँ"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-kn.json b/utils/DesktopFAQ/faq-kn.json
new file mode 100644
index 000000000..1be7171ac
--- /dev/null
+++ b/utils/DesktopFAQ/faq-kn.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "ನನ್ನ ಮಂಡಳಿ, ಮಾಧ್ಯಮ, ತರಗತಿ ಮತ್ತು ವಿಷಯ ಕಾಣುತ್ತಿಲ್ಲ",
+      "description": "ನಿಮ್ಮ ರಾಜ್ಯವು ಸದ್ಯಕ್ಕೆ ಎಲ್ಲ ಮಂಡಳಿಗಳು, ಮಾಧ್ಯಮಗಳು, ತರಗತಿಗಳು ಮತ್ತು ವಿಷಯಗಳನ್ನು ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ. ನಿಮ್ಮ ರಾಜ್ಯವು ಅವುಗಳನ್ನು ಸೇರಿಸಿದ ನಂತರ, ನೀವು ಪಟ್ಟಿಯಲ್ಲಿ ಅವನ್ನು ಕಾಣುತ್ತೀರಿ "
+    },
+    {
+      "topic": "ನಾನು ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿದೆ, ಆದರೆ ಪ್ಲೇ ಮಾಡಲು ಆಗುತ್ತಿಲ್ಲ, ಯಾಕೆಂದರೆ ಅದು ಇಂಟರ್ನೆಟ್ ಬೇಕೆಂದು ಹೇಳುತ್ತಿದೆ",
+      "description": "ನೀವು ಯು ಟ್ಯೂಬ್ ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿರಬಹುದು. ನೀವು ಆನ್ಲೈನ್ ಇದ್ದಾಗ ಮಾತ್ರ ಯು ಟ್ಯೂಬ್ ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಬಹುದು. ಕಂಪ್ಯೂಟರನ್ನು ಇಂಟರ್ನೆಟ್ ಗೆ ಸಂಪರ್ಕಿಸಿ, ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
+    },
+    {
+      "topic": "ನನಗೆ ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಆಪ್ ಅನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಬೇಕಿದೆ",
+      "description": "ನಿಮ್ಮ ಕಂಪ್ಯೂಟರನ್ನು ಇಂಟರ್ನೆಟ್ ಗೆ ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ಇತ್ತೀಚಿನ ಆಪ್ ಆವೃತ್ತಿಗೆ https://staging.sunbirded.org/desktop/latest ಅನ್ನು ಪರೀಕ್ಷಿಸಿ"
+    },
+    {
+      "topic": "ನನಗೆ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ ಇರುವ ಲ್ಯಾಪ್ಟಾಪ್ ಗೆ ಲಭ್ಯತೆ ಇಲ್ಲ, ಆದರೆ ಡೆಸ್ಕ್ ಟಾಪ್ ಆಪ್ ನಲ್ಲಿ ನಾನು ಪಠ್ಯಾಂಶಗಳನ್ನು ಸೇರಿಸಲು ಅಥವಾ ನವೀಕರಿಸಲು ಬಯಸಿದ್ದೇನೆ. ",
+      "description": "ನಿಮ್ಮ ಬಳಿ ಮೊಬೈಲ್ ಫೋನಿದ್ದರೆ, ಗೂಗಲ್ ಪ್ಲೇ ಸ್ಟೋರಿನಿಂದ ದೀಕ್ಷಾ ಮೊಬೈಲ್ ಆಪ್ ಡೌನ್ಲೋಡ್ ಮಾಡಿ.\nಆಪ್ ನಲ್ಲಿ ಪಠ್ಯಾಂಶವನ್ನು ಹುಡುಕಿರಿ. \nದೀಕ್ಷಾ ಗ್ರಂಥಾಲಯದಿಂದ ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ.\nಅದನ್ನು ಪೆನ್ ಡ್ರೈವಿಗೆ ಅಥವಾ ಎಸ್ ಡಿ ಕಾರ್ಡಿಗೆ ಕಾಪಿ ಮಾಡಿ ಮತ್ತು ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಆಪ್ ಗೆ ಅಪ್ಲೋಡ್ ಮಾಡಿ. "
+    },
+    {
+      "topic": "ನನಗೆ ನಿರ್ದಿಷ್ಟವಾದ ಅಧ್ಯಾಯದ ಪಠ್ಯಾಂಶ ಕಾಣುತ್ತಿಲ್ಲ, ಅಥವಾ ಸಂಬಂಧವಿಲ್ಲದ ಪಠ್ಯಾಂಶ ಕಾಣುತ್ತಿದೆ",
+      "description": "ಪಠ್ಯಾಂಶವನ್ನು ಹುಡುಕಲು ದೀಕ್ಷಾದ ಆನ್ಲೈನ್ ಗ್ರಂಥಾಲಯದಲ್ಲಿ ಬ್ರೌಸ್ ಮಾಡಿ. ಆಗಲೂ ಸಿಗದಿದ್ದರೆ, ಪಠ್ಯಾಂಶ ಕುರಿತ ಹಿಮ್ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮ ಡಿ.ಎಸ್.ಇ.ಆರ್.ಟಿ.ಗೆ ಕಳಿಸಿ. "
+    },
+    {
+      "topic": "ಆಪ್ ತುಂಬಾ ನಿಧಾನವಿದೆ",
+      "description": "ಆಪ್ ಕಾರ್ಯಕ್ಷಮತೆಯನ್ನು ವೇಗವಾಗಿಸಲು, ಕೆಳಗಿನಂತೆ ಮಾಡಿ: \n<br>ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಸಿಸ್ಟಮ್ ಕಾನ್ಫಿಗರೇಶನ್ ಗೆ ಹೋಗಿ. ಕನಿಷ್ಟ ಕಾನ್ಫಿಗರೇಶನ್ ಹೀಗಿರಬೇಕು: \n <ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br> ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಕಾನ್ಫಿಗರೇಶನ್ ಗೆ ಹೊಂದುತ್ತಿದ್ದರೆ ಅಥವಾ ಇದಕ್ಕಿಂದ ಹೆಚ್ಚಿನದಿದ್ದರೆ, ಆಪ್ ಅನ್ನು ರಿಸ್ಟಾರ್ಟ್ ಮಾಡಿ. \n<br>ಹೀಗೆ ಮಾಡಿದ ನಂತರವೂ, ನಿಧಾನವಾಗಿದ್ದರೆ, ಇಲ್ಲಿಗೆ ಹೋಗಿ<b>ಟಾಸ್ಕ್ ಮ್ಯಾನೇಜರ್</b>,\nಬಳಕೆಮಾಡದ ಎಲ್ಲ ಬ್ಯಾಕ್ ಗ್ರೌಂಡ್ ಪ್ರಕ್ರಿಯೆಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು ಕ್ಲಿಕ್ ಮಾಡಿ <b>ಎಂಡ್ ಟಾಸ್ಕ್</b>"
+    },
+    {
+      "topic": "ನನಗೆ ಪಠ್ಯಾಂಶವನ್ನು ಪೆನ್ ಡ್ರೈವಿಗೆ ಕಾಪಿ ಮಾಡಲು ಆಗುತ್ತಿಲ್ಲ",
+      "description": "ಪಠ್ಯಾಂಶವನ್ನು ಪೆನ್ ಡ್ರೈವಿಗೆ ಕಾಪಿ ಮಾಡಲು, ಕೆಳಗೆ ಸೂಚಿಸಿರುವಂತೆ ಮಾಡಿ: \n<ul><li>ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಸೆಟ್ಟಿಂಗ್ಸ್ ಗೆ ಹೋಗಿ. ಯುಎಸ್ಬಿ ಡ್ರೈವ್ ರೈಟ್ ಪ್ರೊಟೆಕ್ಟೆಡ್ ಎಂದು ಇದೆಯೇ ನೋಡಿ. ಹಾಗಿದ್ದರೆ, ಪ್ರೊಟೆಕ್ಷನ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</li> \n<li>ಪೆನ್ ಡ್ರೈವಿನಲ್ಲಿ ಖಾಲಿ ಜಾಗವಿದೆಯೇ ನೋಡಿ. ಪೆನ್ ಡ್ರೈವಿನಲ್ಲಿ ಅನಗತ್ಯ ಫೈಲುಗಳನ್ನು ಡಿಲೀಟ್ ಮಾಡಿ</li></ul>"
+    },
+    {
+      "topic": "ನನ್ನ ಪೆನ್ ಡ್ರವಿಗೆ ಪಠ್ಯಾಂಶವನ್ನು ಲೋಡ್ ಮಾಡಿರುವೆ, ಆದರೆ ಈಗ ಅದು ಖಾಲಿಯಾಗಿ ಕಾಣುತ್ತಿದೆ",
+      "description": "ನಿಮ್ಮ ಪೆನ್ ಡ್ರೈವ್ ಅಥವಾ ಕಂಪ್ಯೂಟರ್ ಗೆ ವೈರಸ್ ದಾಳಿಯಾಗಿರಬಹುದು. ಇದನ್ನು ಪರೀಕ್ಷಿಸಿ: \n* ನಿಮ್ಮ ಸಿಸ್ಟಮ್ ನಲ್ಲಿ ಆಂಟಿ ವೈರಸ್ ಸಾಫ್ಟ್ ವೇರ್ ಇನ್ ಸ್ಟಾಲ್ ಆಗಿದೆಯೇ ನೋಡಿ\n* ಅಪರಿಚಿತ ಕಂಪ್ಯೂಟರ್ ಗೆ ನಿಮ್ಮ ಪೆನ್ ಡ್ರೈವ್ ಹಾಕುವ ಮೊದಲು, ಅದು ರೈಟ್-ಪ್ರೊಟೆಕ್ಟೆಡ್ ಆಗಿದೆಯೇ ನೋಡಿ"
+    },
+    {
+      "topic": "ಪಠ್ಯಾಂಶವನ್ನು ನನ್ನ ಪೆನ್ ಡ್ರೈವಿಗೆ ಮತ್ತು ನನ್ನ ಪೆನ್ ಡ್ರೈವಿನಿಂದ ಕಾಪಿ ಮಾಡಲು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ",
+      "description": "ಕಾಪಿ ಮಾಡಲು ತೆಗೆದುಕೊಳ್ಳುವ ಸಮಯವು ಪಠ್ಯಾಂಶ ಫೈಲಿನ ಗಾತ್ರವನ್ನು ಅವಲಂಬಿಸಿರುತ್ತದೆ. ದೊಡ್ಡ ಪಠ್ಯಪುಸ್ತಕಗಳಾದರೆ ಕಾಪಿಯಾಗಲು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತವೆ. ಮಧ್ಯದಲ್ಲಿ ಕಾಪಿ ಪ್ರಕ್ರಿಯೆಯನ್ನು ನಿಲ್ಲಿಸಬೇಡಿ. ಹಾಗೆ ಮಾಡಿದರೆ ಫೈಲುಗಳು ಸರಿಯಾಗಿ ಕಾಪಿಯಾಗುವುದಿಲ್ಲ."
+    },
+    {
+      "topic": "ದೀಕ್ಷಾ ಪಠ್ಯಾಂಶದಿಂದಾಗಿ ನನ್ನ ಕಂಪ್ಯೂಟರಿನಲ್ಲಿ ಖಾಲಿ ಜಾಗ ಉಳಿದಿಲ್ಲ",
+      "description": "ನಿಮ್ಮ ಕಂಪ್ಯೂಟರಿನಲ್ಲಿ ಜಾಗ ಖಾಲಿ ಮಾಡಲು ಆಪ್ ನ ಮೈ ಡೌನ್ಲೋಡ್ಸ್ ಟ್ಯಾಬಿನಿಂದ ಡೌನ್ಲೋಡ್ ಆಗಿರುವ ಪಠ್ಯಾಂಶಗಳನ್ನು ಡಿಲೀಟ್ ಮಾಡಿ"
+    },
+    {
+      "topic": "ನನ್ನ ಉಬಂಟು ಸಿಸ್ಟಮ್ ನಲ್ಲಿ ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪಿಸಲು ಆಗುತ್ತಿಲ್ಲ",
+      "description": "<p>ನಿಮ್ಮ ಉಬಂಟು ಸಿಸ್ಟಮ್ ನಲ್ಲಿ ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಅಪ್ಲಿಕೇಷನ್ ಹಾಕಿಕೊಳ್ಳಲು:<p>\n<p>1) ನಿಮ್ಮ ಟರ್ಮಿನಲ್ ಓಪನ್ ಮಾಡಿ</p> \n<p>2) ಕಮಾಂಡ್ ಸಿಡಿ ರನ್ ಮಾಡಿ <location> exe ಫೈಲ್ ಡೌನ್ಲೋಡ್ ಆಗಿರುವಲ್ಲಿ ಡೈರೆಕ್ಟರಿಯನ್ನು ಬದಲಿಸಲು. ಉದಾಹರಣೆಗೆ, exe ಯು ಡೌನ್ಲೋಡ್ಸ್ ಫೋಲ್ಡರಿನಲ್ಲಿ ಸೇವ್ ಆಗಿದ್ದರೆ, ಆಗ ಕಮಾಂಡ್ ಸಿಡಿ ಡೌನ್ಲೋಡ್ಸ್ ಅನ್ನು ರನ್ ಮಾಡಿ</p>\n<p>3) ಕಮಾಂಡ್ sudo dpkg ರನ್ ಮಾಡಿ -i <filename></p>\n<p>ಈ ಕಮಾಂಡ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ರನ್ ಮಾಡಿದ ನಂತರ, ಅಪ್ಲಿಕೇಶನ್ ಶುರುವಾಗುತ್ತದೆ</p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "ಉಳಿದಿರುವ ಅಕ್ಷರಗಳು",
+    "explainMsg": "ನೀವು ತೊಂದರೆಯನ್ನು ವಿವರಿಸುವಿರಾ?",
+    "faqMsg": "ಪದೇಪದೇ ಕೇಳುವ ಪ್ರಶ್ನೆಗಳು",
+    "help": "ಸಹಾಯ",
+    "helpMsg": "ಈ ಉತ್ತರದಿಂದ ನಿಮಗೆ ಸಹಾಯವಾಯಿತೇ? ",
+    "initiateEmailButton": "ಇಮೇಲ್ ಆರಂಭಿಸಿ ",
+    "knowMoreMsg": "ಇನ್ನೂ ಹೆಚ್ಚಿನದೇನದನ್ನು ತಿಳಿಯಲು ಬಯಸುವಿರಿ? ",
+    "noMsg": "ಇಲ್ಲ",
+    "reportIssue": "ಸಮಸ್ಯೆ ಇದೆಯೆಂದು ವರದಿ ಮಾಡಿ",
+    "reportIssueMsg": "ಬೇರೆ ಸಮಸ್ಯೆ ಬಗ್ಗೆ ವರದಿ ಮಾಡಿ ",
+    "resolveMsg": "ನಿಮ್ಮ ಸಮಸ್ಯೆ ಪರಿಹರಿಸಿಕೊಳ್ಳಲು ಪೂರ್ಣ ಪಟ್ಟಿಯನ್ನು ನೋಡಿ",
+    "sorryMsg": "ಅದಕ್ಕಾಗಿ ವಿಷಾದಿಸುತ್ತೇವೆ!",
+    "submitButton": "ಸಲ್ಲಿಸಿ",
+    "tellMoreMsg": "ನೀವು ಎದುರಿಸಿದ ತೊಂದರೆಯ ಬಗ್ಗೆ ಹೆಚ್ಚಿನ ಮಾಹಿತಿ ಹೇಳಿ. ",
+    "thanksMsg": "ನಿಮ್ಮ ಪ್ರತಿಕ್ರಿಯೆಗೆ ಧನ್ಯವಾದಗಳು!",
+    "triggerEmailMsg": "ನೀವು ಟೆಕ್ಸ್ಟ್ ಬಾಕ್ಸಿನಲ್ಲಿ ವಿವರಗಳನ್ನು ಸೇರಿಸಿದ ನಂತರ, ಇಮೇಲ್ ಆರಂಭಿಸಿ ಬಟನ್ ಅನ್ನು ಒತ್ತಿರಿ, ನಾವು ನಿಮ್ಮ ಪರವಾಗಿ ಇಮೇಲ್ ಶುರು ಮಾಡುತ್ತೇವೆ. ನೀವು ಹೆಚ್ಚಿನ ಮಾಹಿತಿಯನ್ನು /ಅಥವ ಅಲ್ಲಿ ಫೈಲುಗಳನ್ನು ಸೇರಿಸಬಹುದು.",
+    "typeHere": "ಇಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ...",
+    "yesMsg": "ಹೌದು"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-ml.json b/utils/DesktopFAQ/faq-ml.json
new file mode 100644
index 000000000..d0b40c43e
--- /dev/null
+++ b/utils/DesktopFAQ/faq-ml.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "എന്റെ ബോർഡ്, മീഡിയം, ക്ലാസ്, വിഷയം എന്നിവ കാണാൻ എനിക്ക് കഴിയുന്നില്ല ",
+      "description": "നിങ്ങളുടെ സംസ്ഥാനം നിലവിൽ എല്ലാ ബോർഡുകളും മീഡിയങ്ങളും ക്ലാസുകളും വിഷയങ്ങളും പിന്തുണയ്ക്കുന്നില്ല. നിങ്ങളുടെ സംസ്ഥാനം അവരെ ചേർത്താലുടൻ, നിങ്ങൾക്ക് അത് പട്ടികയിൽ കാണാം "
+    },
+    {
+      "topic": "ഞാൻ ഉള്ളടക്കം ഡ download ൺലോഡ് ചെയ്തു, പക്ഷേ എനിക്ക് ഇന്റർനെറ്റ് ആവശ്യമാണെന്ന് പറയുന്നതിനാൽ എനിക്ക് പ്ലേ ചെയ്യാൻ കഴിയില്ല",
+      "description": "നിങ്ങൾ YouTube ഉള്ളടക്കം ഡൗൺലോഡ് ചെയ്തിരിക്കാം. നിങ്ങൾ ഓൺലൈനിൽ ആയിരിക്കുമ്പോൾ മാത്രമേ നിങ്ങൾക്ക് YouTube ഉള്ളടക്കം പ്ലേ ചെയ്യാൻ കഴിയൂ. കമ്പ്യൂട്ടർ ഇന്റർനെറ്റിലേക്ക് കണക്റ്റു ചെയ്‌തു വീണ്ടും ശ്രമിക്കുക."
+    },
+    {
+      "topic": "എന്റെ DIKSHA ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ അപ്‌ഡേറ്റ് ചെയ്യേണ്ടതുണ്ട്",
+      "description": "നിങ്ങളുടെ കമ്പ്യൂട്ടർ ഇന്റർനെറ്റിലേക്ക് കണക്റ്റുചെയ്‌ത് ഏറ്റവും പുതിയ അപ്ലിക്കേഷൻ പതിപ്പിനായി https://staging.sunbirded.org/desktop/latest പരിശോധിക്കുക"
+    },
+    {
+      "topic": "എനിക്ക് ഇന്റർനെറ്റ് കണക്ഷനുള്ള ഒരു ലാപ്‌ടോപ്പ് ഇല്ല, പക്ഷേ ഡെസ്‌ക്‌ടോപ്പ് അപ്ലിക്കേഷനിൽ ഉള്ളടക്കം ചേർക്കാനോ അപ്‌ഡേറ്റുചെയ്യാനോ ഞാൻ ആഗ്രഹിക്കുന്നു",
+      "description": "നിങ്ങൾക്ക് ഒരു മൊബൈൽ ഫോൺ ഉണ്ടെങ്കിൽ, google പ്ലേസ്റ്റോറിൽ നിന്ന് DIKSHA മൊബൈൽ അപ്ലിക്കേഷൻ ഡൗൺലോഡുചെയ്യുക. അപ്ലിക്കേഷനിലെ ഉള്ളടക്കത്തിനായി ബ്രൗസുചെയ്യുക. DIKSHA ലൈബ്രറിയിൽ നിന്ന് ഉള്ളടക്കം ഡൗൺലോഡുചെയ്യുക.ഒരു പെൻഡ്രൈവ് അല്ലെങ്കിൽ SD കാർഡിൽ പകർത്തി അത് DIKSHA ഡെസ്‌ക്‌ടോപ്പ് അപ്ലിക്കേഷനിൽ അപ്‌ലോഡുചെയ്യുക."
+    },
+    {
+      "topic": "ഒരു പ്രത്യേക വിഷയത്തിൽ എനിക്ക് ഉള്ളടക്കം കണ്ടെത്താൻ കഴിയില്ല, അല്ലെങ്കിൽ എനിക്ക് ലഭിക്കുന്ന ഉള്ളടക്കം അപ്രസക്തമാണ്",
+      "description": "ഉള്ളടക്കത്തിനായി തിരയുന്നതിന് DIKSHA യുടെ ഓൺലൈൻ ലൈബ്രറി ബ്രൗസ് ചെയ്യുക.അവിടെ ലഭ്യമല്ലെങ്കിൽ, ഉള്ളടക്കത്തെക്കുറിച്ചുള്ള നിങ്ങളുടെ ഫീഡ്ബാക്ക് സംസ്ഥാന SCERT ലേക്ക് അയയ്ക്കുക"
+    },
+    {
+      "topic": "അപ്ലിക്കേഷൻ മന്ദഗതിയിലാണ്",
+      "description": "അപ്ലിക്കേഷൻ പ്രകടനം വേഗത്തിലാക്കാൻ,ചുവടെപറയുന്നവ ചെയ്യുക:\n<br>നിങ്ങളുടെ കമ്പ്യൂട്ടറിന്റെ സിസ്റ്റം കോൺഫിഗറേഷനിലേക്ക് പോകുക. ഏറ്റവും കുറഞ്ഞ കോൺഫിഗറേഷൻ ഇതായിരിക്കണം:\n<ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br>നിങ്ങളുടെ കമ്പ്യൂട്ടറിന്റെ കോൺഫിഗറേഷൻ തുല്യമോ അതിൽ കൂടുതലോ ആണെങ്കിൽ, അപ്ലിക്കേഷൻ പുനരാരംഭിക്കുക.\n<br>ഇത് ചെയ്തതിനു ശേഷവും അപ്ലിക്കേഷൻ മന്ദഗതിയിലാണെങ്കിൽ, <b> ടാസ്ക് മാനേജർ </b> ലേക്ക് പോകുക,ഉപയോഗിക്കാത്ത എല്ലാ പശ്ചാത്തല പ്രക്രിയകളും തിരഞ്ഞെടുത്ത് <b> ടാസ്ക് അവസാനിപ്പിക്കുക </b> ക്ലിക്കുചെയ്യുക"
+    },
+    {
+      "topic": " പെൻഡ്രൈവിലേക്ക് ഉള്ളടക്കം പകർത്താൻ എനിക്ക് കഴിയില്ല ",
+      "description": "ഒരു പെൻ ഡ്രൈവിലേക്ക് ഉള്ളടക്കം പകർത്താൻ,ചുവടെപറയുന്നവ ചെയ്യുക:\n<ul><li>നിങ്ങളുടെ കമ്പ്യൂട്ടർ ക്രമീകരണങ്ങളിലേക്ക് പോകുക.USB ഡ്രൈവ് എഴുത്ത് പരിരക്ഷിതമാണോയെന്ന് പരിശോധിക്കുക. അങ്ങനെയാണെങ്കിൽ, പരിരക്ഷണം പ്രവർത്തനരഹിതമാക്കുക</li>\n<li>പെൻഡ്രൈവിൽ ഇടമുണ്ടോയെന്ന് പരിശോധിക്കുക. പെൻഡ്രൈവിൽ നിന്ന് അനാവശ്യ ഫയലുകൾ ഡിലീറ്റ് ചെയ്യുക</li></ul> "
+    },
+    {
+      "topic": "എന്റെ പെൻ‌ഡ്രൈവിൽ ഞാൻ ഉള്ളടക്കം ലോഡുചെയ്തിരുന്നു, പക്ഷേ ഇപ്പോൾ അത് ശൂന്യമായി ഞാൻ കാണുന്നു",
+      "description": "നിങ്ങളുടെ പെൻ ഡ്രൈവ് അല്ലെങ്കിൽ കമ്പ്യൂട്ടർ ഒരു വൈറസ് ബാധിച്ചേക്കാം. പരിശോധിക്കുക:\n* നിങ്ങളുടെ ഉപകരണത്തിൽ ആന്റി വൈറസ് സോഫ്റ്റ്വെയർ ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ടോ \n* അജ്ഞാത ഉപകരണങ്ങളിലേക്ക് കണക്റ്റുചെയ്യുന്നതിന് മുമ്പ് നിങ്ങളുടെ പെൻ ഡ്രൈവ് പുനരാലേഖനം ചെയ്യപ്പെടുന്നുണ്ടോ"
+    },
+    {
+      "topic": "എന്റെ പെൻ ഡ്രൈവിലേക്കും പെൻ ഡ്രൈവിൽ നിന്നോ ഉള്ളടക്കം പകർത്താൻ സമയമെടുക്കും",
+      "description": "പകർത്താൻ എടുക്കുന്ന സമയം ഉള്ളടക്ക ഫയലിന്റെ വലുപ്പത്തെ ആശ്രയിച്ചിരിക്കുന്നു. ചില വലിയ പാഠപുസ്തകങ്ങൾ പകർത്താൻ സമയമെടുക്കും.അതിനിടയിൽ പ്രക്രിയ നിർത്തരുതെന്ന് ഞങ്ങൾ ശുപാർശ ചെയ്യുന്നു. അങ്ങനെ ചെയ്യുന്നത് പൊരുത്തമില്ലാത്ത ഫയലുകളിലേക്ക് നയിച്ചേക്കാം."
+    },
+    {
+      "topic": "DIKSHA ഉള്ളടക്കം കാരണം എന്റെ കമ്പ്യൂട്ടറിൽ ഇടമില്ല",
+      "description": "നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ ഇടം ശൂന്യമാക്കുന്നതിന് അപ്ലിക്കേഷന്റെ എന്റെ ഡൗൺലോഡുകൾ ടാബിൽ നിന്ന് ഡൗൺലോഡുചെയ്‌ത ഉള്ളടക്കം ഡിലീറ്റ് ചെയ്യുക"
+    },
+    {
+      "topic": "എന്റെ ഉബുണ്ടു സിസ്റ്റത്തിൽ DIKSHA ഡെസ്ക്ടോപ്പ് ആപ്ലിക്കേഷൻ ഇൻസ്റ്റാൾ ചെയ്യാൻ കഴിയുന്നില്ല ",
+      "description": "<p> നിങ്ങളുടെ ഉബുണ്ടു സിസ്റ്റത്തിൽ DIKSHA ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ ഇൻസ്റ്റാൾ ചെയ്യുന്നതിന്: </p> <p>1) നിങ്ങളുടെ ടെർമിനൽ തുറക്കുക </p> \n<p> 2)exe ഫയൽ ഡൗൺലോഡ് ‌ചെയ്‌ത സ്ഥലത്തേക്ക് ഡയറക്‌ടറി മാറ്റുന്നതിന് <location>cd കമാൻഡ് പ്രവർത്തിപ്പിക്കുക. ഉദാഹരണത്തിന്, ഡൗൺലോഡ് ഫോൾ‌ഡറിൽ‌ exe സംരക്ഷിച്ചിട്ടുണ്ടെങ്കിൽ‌,കമാൻഡ് cd ഡൗൺലോഡുകൾ പ്രവർത്തിപ്പിക്കുക</p>\n<p>3) sudo dpkg -i കമാൻഡ് പ്രവർത്തിപ്പിക്കുക <filename> </p>\n<p> ഈ കമാൻഡ് വിജയകരമായി പ്രവർത്തിപ്പിക്കുമ്പോൾ അപ്ലിക്കേഷൻ സമാരംഭിച്ചു </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "പ്രതീകങ്ങൾ ശേഷിക്കുന്നു",
+    "explainMsg": "നിങ്ങൾക്ക് പ്രശ്നം വിശദീകരിക്കാമോ?",
+    "faqMsg": "പതിവായി ചോദിക്കുന്ന ചോദ്യങ്ങൾ",
+    "help": "സഹായം",
+    "helpMsg": "ഈ ഉത്തരം നിങ്ങളെ സഹായിച്ചോ?\n",
+    "initiateEmailButton": "ഇമെയിൽ ആരംഭിക്കുക",
+    "knowMoreMsg": "കൂടുതൽ എന്താണ് നിങ്ങൾ അറിയാൻ ആഗ്രഹിക്കുന്നത്?",
+    "noMsg": "ഇല്ല",
+    "reportIssue": "ഒരു പ്രശ്നം റിപ്പോർട്ടുചെയ്യുക",
+    "reportIssueMsg": "മറ്റ് പ്രശ്നം റിപ്പോർട്ട് ചെയ്യുക",
+    "resolveMsg": "നിങ്ങളുടെ പ്രശ്നം പരിഹരിക്കാൻ പട്ടികയിലൂടെ നോക്കുക",
+    "sorryMsg": "ക്ഷമിക്കണം!",
+    "submitButton": "സമർപ്പിക്കുക",
+    "tellMoreMsg": "നിങ്ങൾ നേരിട്ട പ്രശ്നത്തെക്കുറിച്ച് ഞങ്ങളോട് കൂടുതൽ പറയുക",
+    "thanksMsg": "നിങ്ങളുടെ പ്രതികരണത്തിന് നന്ദി!",
+    "triggerEmailMsg": "ടെക്സ്റ്റ് ബോക്സിൽ നിങ്ങൾ വിശദാംശങ്ങൾ ചേർത്ത് ഇമെയിൽ ആരംഭിക്കുക ബട്ടൺ ടാപ്പുചെയ്ത ശേഷം, നിങ്ങളുടെ താൽപ്പര്യാർത്ഥം ഞങ്ങൾ ഒരു ഇമെയിൽ പ്രവർത്തനക്ഷമമാക്കും. നിങ്ങൾക്ക് കൂടുതൽ വിശദാംശങ്ങൾ ചേർക്കാനും അല്ലെങ്കിൽ അവിടെ ഫയലുകൾ അറ്റാച്ചുചെയ്യാനും കഴിയും.",
+    "typeHere": "ഇവിടെ ടൈപ്പ് ചെയ്യുക...",
+    "yesMsg": "അതെ"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-mr.json b/utils/DesktopFAQ/faq-mr.json
new file mode 100644
index 000000000..ba4453fdc
--- /dev/null
+++ b/utils/DesktopFAQ/faq-mr.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "मला माझे बोर्ड, माध्यम, इयत्ता व विषय दिसत नाहीत ",
+      "description": "तुमचे राज्य सध्या सर्व बोर्ड, माध्यमे, इयत्ता व विषयांना समर्थन देत नाही. तुमच्या राज्याने हे जोडताच, तुम्हाला ते यादीत दिसेल."
+    },
+    {
+      "topic": "मी सामग्री डाउनलोड केली आहे, पण 'इंटरनेट आवश्यक आहे' या कारणास्तव मी ती चालवू शकत नाही ",
+      "description": "तुम्ही यूट्यूब वरची सामग्री डाउनलोड केलेली असू शकते. तुम्ही यूट्यूब सामग्री फक्त ऑनलाइन असताना चालवू शकता. कॉम्प्युटर इंटरनेटशी जोडून पुन्हा प्रयत्न करा."
+    },
+    {
+      "topic": "मला माझा DIKSHA डेस्कटॉप ऍप अपडेट करायचा आहे ",
+      "description": "ऍपच्या नवीनतम आवृत्तीसाठी तुमचा कॉम्प्युटर इंटरनेटशी जोडून https://staging.sunbirded.org/desktop/latest तपासा "
+    },
+    {
+      "topic": "माझ्याकडे इंटरनेट कनेक्शन असलेला लॅपटॉप नाही, पण मला डेस्कटॉप ऍपवर सामग्री जोडायची किंवा अपडेट करायची आहे ",
+      "description": "तुमच्याकडे मोबाइल फोन असल्यास, गूगल प्लेस्टोर वरून DIKSHA मोबाइल ऍप डाउनलोड करा.\nऍपवरून सामग्री ब्राउझ करा.\nDIKSHA लायब्ररी मधून सामग्री डाउनलोड करा.\nती पेन ड्राइव्ह किंवा SD कार्ड वर कॉपी करून DIKSHA डेस्कटॉप ऍपवर अपलोड करा."
+    },
+    {
+      "topic": "मला एका विशिष्ट विषयाची सामग्री मिळत नाही, किंवा मिळालेली सामग्री असंबद्ध आहे ",
+      "description": "सामग्री शोधण्यासाठी दीक्षा DIKSHAची ऑनलाइन लायब्ररी ब्राउझ करा. तिथेही सामग्री उपलब्ध नसल्यास, तुमचा सामग्री विषयी अभिप्राय राज्य SCERTकडे पाठवा "
+    },
+    {
+      "topic": "ऍपचा वेग खूप कमी आहे ",
+      "description": "तुमच्या ऍपची कार्यक्षमता वाढवण्यासाठी खालीलप्रमाणे करा:\n<br>तुमच्या कॉम्प्युटरच्या सिस्टिम कॉन्फिगरेशन वर जा. तुमचे किमान कॉन्फिगरेशन असायला हवे: \n<ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br>तुमच्या कॉम्पुटरचे कॉन्फिगरेशन एवढे, किंवा यापेक्षा जास्त असल्यास, ऍप पुन्हा सुरू करा.\n<br>हे करूनही ऍपचा वेग कमी असल्यास <b>कार्य व्यवस्थापक</b> इथे जा,\nवापरात नसलेल्या सर्व पार्श्वभूमी प्रक्रिया सिलेक्ट करा व <b>कार्य संपवा</b> क्लिक करा "
+    },
+    {
+      "topic": "मी सामग्री पेन ड्राइव्ह वर कॉपी करू शकत नाही आहे ",
+      "description": "सामग्री पेन ड्राइव्ह वर कॉपी करण्यासाठी खालीलप्रमाणे करा:\n<li>तुमच्या कॉम्प्युटर सेटिंग्ज वर जा. तुमचा USB ड्राइव्ह लिखाण-प्रतिबंधित आहे का, हे तपासा.असल्यास, प्रतिबंध अक्षम करा</li>\n<li>पेन ड्राइव्ह वर मोकळी जागा आहे का पहा. नको असलेल्या फाइल्स पेन ड्राइव्ह वरून डिलीट करा</li></ul>"
+    },
+    {
+      "topic": "मी माझ्या पेन ड्राइव्ह वर सामग्री लोड केली होती, पण आता ती रिकामी आहे असे दिसते ",
+      "description": "तुमचा पेन ड्राइव्ह किंवा कॉम्पुटर व्हायरसने बाधित झाला असण्याची शक्यता आहे. हे तपासा:\n*तुमच्या यंत्रावर अँटी-व्हायरस सॉफ्टवेअर स्थापित केले आहे का \n*अज्ञात यंत्रांशी जोडण्याआधी तुमची पेन ड्राइव्ह लिखाण-प्रतिबंधित केली आहे का "
+    },
+    {
+      "topic": "माझ्या पेन ड्राइव्हवर, किंवा पेन ड्राइव्ह वरून सामग्री कॉपी करण्यास खूप वेळ लागतो ",
+      "description": "कॉपी करण्यासाठी लागणारा वेळ सामग्रीच्या फाइलच्या आकारमानावर अवलंबून आहे. काही मोठी पाठ्यपुस्तके कॉपी करण्यास वेळ लागतो. कॉपीची प्रक्रिया मध्येच थांबवू नये असा आमचा सल्ला आहे. असे केल्यास फाइल्स मध्ये विसंगती येऊ शकते. "
+    },
+    {
+      "topic": "DIKSHAच्या सामग्रीमुळे माझ्या कॉम्प्युटरवर मोकळी जागा उरली नाही ",
+      "description": "तुमच्या कॉम्प्युटरवर जागा मोकळी करण्यासाठी, ऍपवरील माझे डाउनलोड टॅब वरून डाउनलोड केलेली सामग्री डिलीट करा "
+    },
+    {
+      "topic": "माझ्या उबंटू सिस्टिम वर DIKSHA डेस्कटॉप ऍप स्थापित करण्यास अयशस्वी ",
+      "description": "<p>तुमच्या उबंटू सिस्टिम वर DIKSHA डेस्कटॉप ऍप स्थापित करण्यासाठी:</p>\n<p>१) तुमचे टर्मिनल उघडा</p>\n<p>२) निर्देशिका बदलून exe फाइल जिथे डाउनलोड केलेली आहे तिथे नेण्यासाठी cd <स्थान> ही आज्ञा करा. उदा:, exe डाउनलोड फोल्डर मध्ये सेव्ह केली असल्यास, cd Downloads</p> ही आज्ञा करा \n<p>३) sudo dpkg -i <filename></p> ही आज्ञा करा \n<p>ही आज्ञा यशस्वीरीत्या केल्यानंतर हे ऍप सुरू केले जाईल </p>\n"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "उर्वरित वर्ण ",
+    "explainMsg": "तुम्ही समस्येचे स्पष्टीकरण द्याल का?",
+    "faqMsg": "विचारण्यात येणारे प्रश्न",
+    "help": "सहायता",
+    "helpMsg": "ह्या उत्तराची तुम्हाला मदत झाली का?",
+    "initiateEmailButton": "ईमेल आरंभ करा",
+    "knowMoreMsg": "तुम्हाला आणखीन काही जाणून घ्यायचे आहे का?",
+    "noMsg": "नाही",
+    "reportIssue": "तक्रार दाखल करा",
+    "reportIssueMsg": "इतर तक्रारी दाखल करा",
+    "resolveMsg": "तुमच्या समस्येचे निराकरण करण्यासाठी सूची पहा",
+    "sorryMsg": "क्षमस्व!",
+    "submitButton": "सबमिट करा",
+    "tellMoreMsg": "तुमच्या समस्येबद्दल आम्हाला अधिक सांगा",
+    "thanksMsg": "तुमच्या प्रतिसादासाठी धन्यवाद!",
+    "triggerEmailMsg": "तुम्ही माहिती जोडल्यानंतर आणि 'ईमेल आरंभ करा' बटण टॅप केल्यानंतर, आम्ही तुमच्या वतीने ईमेल ट्रिगर करू. तेथे तुम्ही अधिक माहिती आणि / किंवा फायली संलग्न करू शकता.",
+    "typeHere": "येथे टाईप करा",
+    "yesMsg": "होय"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-or.json b/utils/DesktopFAQ/faq-or.json
new file mode 100644
index 000000000..315ef2437
--- /dev/null
+++ b/utils/DesktopFAQ/faq-or.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "ମୁ ମୋର ବୋର୍ଡ , ମାଧ୍ୟମ, ଶ୍ରେଣୀ ଓ ବିଷୟ ଦେଖିପାରୁନାହିଁ ",
+      "description": "ଆପଣଙ୍କ ରାଜ୍ୟ ବର୍ତ୍ତମାନ ସବୁ ବୋର୍ଡ ,ମାଧ୍ୟମ ,ଶ୍ରେଣୀ ଏବଂ ବିଷୟକୁ ସପୋର୍ଟ କରୁନାହିଁ | ଆପଣଙ୍କ ରାଜ୍ୟ ଏସବୁକୁ ଯୋଡିବା ମାତ୍ରେ, ଆପଣ ତାହାକୁ ଏହି ସୂଚୀରେ ଦେଖିପାରିବେ "
+    },
+    {
+      "topic": "ମୁଁ କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରିଛି, କିନ୍ତୁ ମୁଁ ଏହାକୁ ପ୍ଲେ କରିପାରୁ ନାହିଁ କାରଣ ଇଣ୍ଟରନେଟ୍ ଆବଶ୍ୟକ ବୋଲି ଏହା ଦର୍ଶାଉଛି ",
+      "description": "ଆପଣ YouTube କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରିଥାଇପାରନ୍ତି । କେବଳ ଅନଲାଇନ୍ ଥିବା ସମୟରେ ହିଁ ଆପଣ YouTube କଣ୍ଟେଣ୍ଟ୍ ପ୍ଲେ କରିପାରିବେ । କମ୍ପ୍ୟୁଟରକୁ ଇଣ୍ଟରନେଟ୍ ରେ କନେକ୍ଟ କରନ୍ତୁ ଏବଂ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ ।"
+    },
+    {
+      "topic": "ମୋର DIKSHA ଡେସ୍କଟପ ଆପ୍ ଅପଡେଟ୍ କରିବାର ଅଛି",
+      "description": "ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରକୁ ଇଣ୍ଟରନେଟରେ କନେକ୍ଟ କରନ୍ତୁ, ଏବଂ ସଦ୍ୟତମ ଆପ୍ ଭର୍ସନ୍ ପାଇଁ ଦେଖନ୍ତୁ, https://staging.sunbirded.org/desktop/latest"
+    },
+    {
+      "topic": "ଇଣ୍ଟରନେଟ୍ କନେକ୍ସନ୍ ଥିବା ଲାପଟପ୍ ମୋ ପାଖରେ ନାହିଁ, କିନ୍ତୁ ମୁଁ ଡେସ୍କଟପ୍ ଆପ୍ ରେ ଥିବା କଣ୍ଟେଣ୍ଟ୍ ଯୋଗ କରିବାକୁ କିମ୍ବା ଅପଡେଟ୍ କରିବାକୁ ଚାହୁଁଛି ।",
+      "description": "ଯଦି ଆପଣଙ୍କର ମୋବାଇଲ୍ ଫୋନ୍ ଥାଏ, ତେବେ google playstore ରୁ DIKSHA ମୋବାଇଲ୍ ଆପ୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ ।\nଆପ୍ ରେ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ ।\nDIKSHA ଲାଇବ୍ରେରୀରୁ କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ ।\nଏହାକୁ ପେନଡ୍ରାଇଭ୍ କିମ୍ବା SD କାର୍ଡରେ କପି କରନ୍ତୁ ଏବଂ DIKSHA ଡେସ୍କଟପ୍ ଆପ୍ ରେ ଅପଲୋଡ୍ କରନ୍ତୁ ।"
+    },
+    {
+      "topic": "ଏକ ନିର୍ଦ୍ଦିଷ୍ଟ ବିଷୟରେ ମୁଁ କଣ୍ଟେଣ୍ଟ୍ ପାଉନାହିଁ, ବା ମୋତେ କଣ୍ଟେଣ୍ଟ୍ ଅପ୍ରାସଙ୍ଗିକ ଲାଗୁଛି",
+      "description": "କଣ୍ଟେଣ୍ଟ୍ ସର୍ଚ୍ଚ କରିବା ପାଇଁ, DIKSHA ର ଅନଲାଇନ୍ ଲାଇବ୍ରେରୀ ବ୍ରାଉଜ୍ କରନ୍ତୁ । ତଥାପି ଯଦି ଏହା ଉପଲବ୍ଧ ନଥାଏ, କଣ୍ଟେଣ୍ଟ୍ ସମ୍ବନ୍ଧରେ ଆପଣଙ୍କ ଫିଡବ୍ୟାକ୍ ରାଜ୍ୟ SCERT କୁ ପଠାନ୍ତୁ "
+    },
+    {
+      "topic": "ଏହି ଆପ୍ ବହୁତ ସ୍ଲୋ ଅଟେ",
+      "description": "ଆପ୍ କାର୍ଯ୍ୟକ୍ଷମତାକୁ ଗତିଶୀଳ କରିବା ପାଇଁ, ନିମ୍ନଲିଖିତ କାର୍ଯ୍ୟ କରନ୍ତୁ: \n<br>ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରର ସିଷ୍ଟମ୍ କନଫିଗରେସନ୍ କୁ ଯାଆନ୍ତୁ । ସର୍ବନିମ୍ନ କନଫିଗରେସନ୍ ଏହା ହେବା ଉଚିତ୍:\n<li>2 GB RAM</li>\n<li>ଡୁଆଲ୍ କୋର୍ ପ୍ରୋସେସର</li></ul>\n<br>ଯଦି ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରରେ ଏହି କନଫିଗରେସନ୍ ଅଛି କିମ୍ବା ଏହାଠାରୁ ଅଧିକ ଅଛି, ତେବେ ଆପ୍ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ ।\n<br>ଏହା କରିବା ପରେ ମଧ୍ୟ ଯଦି ସ୍ଲୋ ହୁଏ, ତେବେ ଏଠାକୁ ଯାଆନ୍ତୁ: <b>ଟାସ୍କ ମ୍ୟାନେଜର୍</b>, ସମସ୍ତ ଅବ୍ୟବହୃତ ବ୍ୟାକଗ୍ରାଉଣ୍ଡ ପ୍ରୋସେସ୍ କୁ ସିଲେକ୍ଟ କରନ୍ତୁ ଏବଂ <b>ଏଣ୍ଡ୍ ଟାସ୍କ</b>ରେ କ୍ଲିକ୍ କରନ୍ତୁ "
+    },
+    {
+      "topic": "ମୁଁ ପେନଡ୍ରାଇଭକୁ କଣ୍ଟେଣ୍ଟ୍ କପି କରିବାରେ ବିଫଳ",
+      "description": "କଣ୍ଟେଣ୍ଟକୁ ପେନଡ୍ରାଇଭକୁ କପି କରିବା ପାଇଁ, ନିମ୍ନଲିଖିତ ସୋପାନ ଅନୁସରଣ କରନ୍ତୁ: \n<ul><li>କମ୍ପ୍ୟୁଟର ସେଟିଂସ୍ କୁ ଯାଆନ୍ତୁ । USB ଡ୍ରାଇଭ୍ ରାଇଟ୍-ପ୍ରୋଟେକ୍ଟେଡ୍ କି ନାହିଁ ଯାଞ୍ଚକରନ୍ତୁ । ଯଦି ଏହା ସେପରି ହୋଇଥାଏ, ପ୍ରୋଟେକ୍ସନକୁ ଡିସେବଲ୍ କରନ୍ତୁ</li>\n<li>ପେନଡ୍ରାଇଭରେ ଫ୍ରି ସ୍ପେସ୍ ଅଛି କି ନାହିଁ ଯାଞ୍ଚକରନ୍ତୁ । ପେନଡ୍ରାଇଭରୁ ଅଦରକାରୀ ଫାଇଲ୍ ଡିଲିଟ୍ କରନ୍ତୁ </li></ul>"
+    },
+    {
+      "topic": "ମୁଁ ପେନଡ୍ରାଇଭରେ କଣ୍ଟେଣ୍ଟ୍ ଲୋଡ୍ କରିଛି, କିନ୍ତୁ ଏବେ ଏହା ଖାଲି ଦେଖାଉଛି ",
+      "description": "ଆପଣଙ୍କ ପେନଡ୍ରାଇଭ୍ କିମ୍ବା କମ୍ପ୍ୟୁଟର ଭାଇରସ୍ ଦ୍ୱାରା ପ୍ରଭାବିତ ହୋଇଥାଇପାରେ । ଯାଞ୍ଚକରନ୍ତୁ କି:\n* ଆପଣଙ୍କ ମେସିନ୍ ରେ ଆଣ୍ଟି ଭାଇରସ୍ ସଫ୍ଟୱେର୍ ଇନଷ୍ଟଲ୍ ହୋଇଛି \n* ଅଜଣା ମେସିନ୍ ସହ ପ୍ଲଗ୍ ଇନ୍ କରିବା ପୂର୍ବରୁ ଯାଞ୍ଚକରନ୍ତୁ କି ଆପଣଙ୍କ ପେନଡ୍ରାଇଭ୍ ରାଇଟ୍-ପ୍ରୋଟେକ୍ଟେଡ୍ ଅଛି "
+    },
+    {
+      "topic": "ମୋ ପେନଡ୍ରାଇଭକୁ ଏବଂ ପେନଡ୍ରାଇଭରୁ କଣ୍ଟେଣ୍ଟ୍ କପି କରିବା ପାଇଁ ଅଧିକ ସମୟ ଲାଗୁଛି ",
+      "description": "କପି କରିବାକୁ ଲାଗୁଥିବା ସମୟ କଣ୍ଟେଣ୍ଟ୍ ଫାଇଲର ଆକାର ଉପରେ ନିର୍ଭର କରେ । କିଛି ବୃହତ୍ ପାଠ୍ୟପୁସ୍ତକ କପି ହେବାକୁ ଅଧିକ ସମୟ ଲାଗେ । ଆମେ ସୁପାରିଶ କରୁଛୁ କି ଏହି ପ୍ରକ୍ରିୟା ଚାଲିବା ସମୟରେ ଆପଣ ବନ୍ଦ କରନ୍ତୁ ନାହିଁ । ଏପରି କରିବା ଦ୍ୱାରା ଫାଇଲ୍ ଠିକ୍ ରହିବ ନାହିଁ । "
+    },
+    {
+      "topic": "DIKSHA କଣ୍ଟେଣ୍ଟ୍ ହେତୁ ମୋ କମ୍ପ୍ୟୁଟରରେ କିଛି ଫ୍ରି ସ୍ପେସ୍ ନାହିଁ ",
+      "description": "ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରରେ ସ୍ପେସ୍ ଫ୍ରି କରିବା ପାଇଁ, ଆପ୍ ର ମାଇଁ ଡାଉନଲୋଡସ୍ ଟ୍ୟାବ୍ ରୁ ଡାଉନଲୋଡ୍ ହୋଇଥିବା କଣ୍ଟେଣ୍ଟ୍ ଡିଲିଟ୍ କରନ୍ତୁ "
+    },
+    {
+      "topic": "ମୋ Ubuntu ସିଷ୍ଟମରେ DIKSHA Desktop ଆପ୍ଲିକେସନ୍ ଇନଷ୍ଟଲ୍ କରିବାରେ ବିଫଳ",
+      "description": "<p>ଆପଣଙ୍କ ubuntu ସିଷ୍ଟମରେ DIKSHA ଡେସ୍କଟପ ଆପ୍ଲିକେସନ୍ ଇନଷ୍ଟଲ୍ କରିବା ପାଇଁ:</p>\n<p>1) ଆପଣଙ୍କ ଟର୍ମିନାଲ୍ ଓପନ୍ କରନ୍ତୁ</p>\n<p>2) ଯେଉଁଠାରେ exe ଫାଇଲ୍ ଡାଉନଲୋଡ୍ ହୋଇଛି, ସେହି ଡିରେକ୍ଟୋରି ବଦଳାଇବା ପାଇଁ, command cd<location> ରନ୍ କରନ୍ତୁ । ଉଦାହରଣ ସ୍ୱରୂପ, ଯଦି exe ଫାଇଲ୍ ଡାଉନଲୋଡସ୍ ଫୋଲଡରରେ ସେଭ୍ ହୋଇଛି, ତେବେ command cd Downloads ରନ୍ କରନ୍ତୁ</p>\n<p>3) sudo dpkg -i <filename> ରନ୍ କରନ୍ତୁ</p>\n<p>ଏହି command ସଫଳତାର ସହ ରନ୍ କରିବା ପରେ, ଆପ୍ଲିକେସନ୍ ଲଞ୍ଚ୍ ହେବ </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "ଏତିକି ଅକ୍ଷର ବାକି ",
+    "explainMsg": "ଆପଣ ସମସ୍ୟାଟିର ବ୍ୟାଖ୍ୟା କରିପାରିବେ କି ?",
+    "faqMsg": "ବାରମ୍ବାର ପଚରା ଯାଉଥିବା ପ୍ରଶ୍ନ ",
+    "help": " ସାହାଯ୍ୟ",
+    "helpMsg": "ଏହି ଉତ୍ତର ଆପଣଙ୍କ କାମରେ ଆସିଲା କି ?",
+    "initiateEmailButton": "ଇମେଲ ଆରମ୍ଭ କରନ୍ତୁ ",
+    "knowMoreMsg": "ଆପଣ ଆଉ କଣ ଜାଣିବାକୁ ଚାହୁଁଛନ୍ତି ?",
+    "noMsg": "ନାହିଁ ",
+    "reportIssue": "ଅସୁବିଧା ଜଣାନ୍ତୁ",
+    "reportIssueMsg": "ଅନ୍ୟ ସମସ୍ୟା ଜଣାନ୍ତୁ",
+    "resolveMsg": "ଆପଣଙ୍କ ସମସ୍ୟାର ସମାଧାନ କରିବା ନିମନ୍ତେ ପୂରା ସୂଚୀ ଦେଖନ୍ତୁ ",
+    "sorryMsg": "ସେଥିପାଇଁ ଦୁଃଖିତ",
+    "submitButton": "ସବମିଟ୍ କରନ୍ତୁ",
+    "tellMoreMsg": "ଆପଣ ସମ୍ମୁଖୀନ ହେଉଥିବା ସମସ୍ୟା ସମ୍ପର୍କରେ ଆମକୁ ଅଧିକ ବିବରଣୀ ଦିଅନ୍ତୁ",
+    "thanksMsg": "ଆପଣଙ୍କ ପ୍ରତିକ୍ରିୟା ପାଇଁ ଧନ୍ୟବାଦ ",
+    "triggerEmailMsg": "ଟେକ୍ସଟ୍ ବକ୍ସରେ ଆପଣ ବିସ୍ତୃତ ବିବରଣୀ ଯୋଗ କରି ଇନିସିଏଟ୍ ଇମେଲ୍ ବଟମ୍ ଟ୍ୟାପ୍ କଲେ, ଆମେ ଆପଣଙ୍କ ତରଫରୁ ଏକ ଇମେଲ୍ ଟ୍ରିଗର କରିବୁ | ଆପଣ ସେଠାରେ ଅଧିକ ବିବରଣୀ ଓ /କିମ୍ବା ଫାଇଲ୍ ଆଟାଚ୍ କରିପାରିବେ",
+    "typeHere": "ଏଠାରେ ଲେଖନ୍ତୁ ",
+    "yesMsg": "ହଁ "
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-pa.json b/utils/DesktopFAQ/faq-pa.json
new file mode 100644
index 000000000..23b6a878f
--- /dev/null
+++ b/utils/DesktopFAQ/faq-pa.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "ਮੈਂ ਆਪਣਾ ਬੋਰਡ, ਮਾਧਿਅਮ, ਕਲਾਸ ਅਤੇ ਵਿਸ਼ਾ ਨਹੀਂ ਦੇਖ ਸਕਦਾ",
+      "description": "ਤੁਹਾਡਾ ਰਾਜ ਇਸ ਸਮੇਂ ਸਾਰੇ ਬੋਰਡਾਂ, ਮਾਧਿਅਮ, ਕਲਾਸਾਂ ਅਤੇ ਵਿਸ਼ਿਆਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ। ਜਿਉਂ ਹੀ ਤੁਹਾਡਾ ਰਾਜ ਉਹਨਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੇਗਾ, ਤੁਸੀਂ ਇਸਨੂੰ ਸੂਚੀ ਵਿੱਚ ਵੇਖੋਗੇ"
+    },
+    {
+      "topic": "ਮੈਂ ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕੀਤੇ ਹਨ, ਪਰ ਮੈਂ ਇਸਨੂੰ ਚਲਾਉਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹਾਂ ਕਿਉਂਕਿ ਇਹ ਕਹਿੰਦਾ ਹੈ ਕਿ ਮੈਨੂੰ ਇੰਟਰਨੈਟ ਦੀ ਜ਼ਰੂਰਤ ਹੈ",
+      "description": "ਤੁਸੀਂ ਯੂਟਿਊਬ ਕੰਟੇਂਟ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਹੋ ਸਕਦਾ ਹੈ। ਤੁਸੀਂ ਉਦੋਂ ਹੀ ਯੂਟਿਊਬ ਕੰਟੇਂਟ ਨੂੰ ਚਲਾ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੁਸੀਂ ਆਨਲਾਈਨ ਹੋ। ਕੰਪਿਊਟਰ ਨੂੰ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
+    },
+    {
+      "topic": "ਮੈਨੂੰ ਆਪਣੀ DIKSHA ਡੈਸਕਟਾਪ ਐਪ ਨੂੰ ਅਪਡੇਟ ਕਰਨ ਦੀ ਜ਼ਰੂਰਤ ਹੈ",
+      "description": "ਆਪਣੇ ਕੰਪਿਊਟਰ ਨੂੰ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ ਅਤੇ ਨਵੀਨਤਮ ਐਪ ਸੰਸਕਰਣ ਲਈ https://staging.sunbirded.org/desktop/latest ਚੈੱਕ ਕਰੋ"
+    },
+    {
+      "topic": "ਮੇਰੇ ਕੋਲ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਵਾਲੇ ਲੈਪਟਾਪ ਤੱਕ ਐਕਸੈਸ ਨਹੀਂ ਹੈ, ਪਰ ਮੈਂ ਡੈਸਕਟੌਪ ਐਪ 'ਤੇ ਕੰਟੇਂਟ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨਾ ਜਾਂ ਅਪਡੇਟ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹਾਂ",
+      "description": "ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਮੋਬਾਈਲ ਫ਼ੋਨ ਹੈ, DIKSHA ਮੋਬਾਈਲ ਐਪ ਨੂੰ ਗੂਗਲ ਪਲੇਸਟੋਰ ਤੋਂ ਡਾਊਨਲੋਡ ਕਰੋ।\nਐਪ ਵਿਚਲੇ ਕੰਟੇਂਟ ਲਈ ਬਰਾਊਜ਼ ਕਰੋ।\nDIKSHA ਲਾਇਬ੍ਰੇਰੀ ਤੋਂ ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕਰੋ।\nਇਸਨੂੰ ਪੈੱਨਡਰਾਈਵ ਜਾਂ SD ਕਾਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ ਅਤੇ ਇਸਨੂੰ DIKSHA ਐਪ 'ਤੇ ਅਪਲੋਡ ਕਰੋ।"
+    },
+    {
+      "topic": "ਮੈਨੂੰ ਕਿਸੇ ਖ਼ਾਸ ਵਿਸ਼ੇ ਲਈ ਕੰਟੇਂਟ ਨਹੀਂ ਮਿਲਦੇ, ਜਾਂ ਅਢੁੱਕਵੇਂ ਕੰਟੇਂਟ ਮਿਲਦੇ ਹਨ",
+      "description": "ਕੰਟੇਂਟ ਦੀ ਭਾਲ ਕਰਨ ਲਈ DIKSHA ਦੀ ਆਨਲਾਈਨ ਲਾਇਬ੍ਰੇਰੀ ਨੂੰ ਬਰਾਊਜ਼ ਕਰੋ। ਜੇ ਇਹ ਅਜੇ ਵੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ, ਤਾਂ ਕੰਟੇਂਟ ਬਾਰੇ ਆਪਣੀ ਫੀਡਬੈਕ ਸਟੇਟ SCERT ਨੂੰ ਭੇਜੋ"
+    },
+    {
+      "topic": "ਐਪ ਬਹੁਤ ਹੌਲੀ ਹੈ",
+      "description": "ਐਪ ਦੀ ਕਾਰਗੁਜ਼ਾਰੀ ਨੂੰ ਤੇਜ਼ ਕਰਨ ਲਈ, ਇਹ ਕਰੋ:\n<br>ਆਪਣੇ ਕੰਪਿਊਟਰ ਦੀ ਸਿਸਟਮ ਕੌਨਫਿਗਰੇਸ਼ਨ 'ਤੇ ਜਾਓ। ਘੱਟੋ ਘੱਟ ਕੌਂਫਿਗਰੇਸ਼ਨ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ:\n<ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br>ਜੇ ਤੁਹਾਡਾ ਕੰਪਿਊਟਰ ਇਸ ਕੌਂਫਿਗਰੇਸ਼ਨ ਨਾਲ ਮੇਲ ਖਾਂਦਾ ਜਾਂ ਵੱਧ ਹੈ, ਤਾਂ ਐਪ ਨੂੰ ਮੁੜ ਚਾਲੂ ਕਰੋ।\n<br>ਅਜਿਹਾ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਜੇ ਇਹ ਅਜੇ ਵੀ ਹੌਲੀ ਹੈ, <b>ਟਾਸਕ ਮੈਨੇਜਰ</b> 'ਤੇ ਜਾਓ,\nਸਾਰੀਆਂ ਨਾ ਵਰਤੀਆਂ ਬੈਕਗਰਾਂਊਡ ਪ੍ਰਕਿਰਿਆਵਾਂ ਨੂੰ ਚੁਣੋ ਅਤੇ ਕਲਿੱਕ ਕਰੋ<b>End Task</b>"
+    },
+    {
+      "topic": "ਮੈਂ ਪੈੱਨਡਰਾਈਵ ਵਿੱਚ ਕੰਟੇਂਟ ਦੀ ਨਕਲ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ ਹਾਂ",
+      "description": "ਪੈੱਨਡਰਾਈਵ 'ਤੇ ਕੰਟੇਂਟ ਦੀ ਨਕਲ ਕਰਨ ਲਈ, ਇਹ ਕਰੋ:\n<ul><li>ਆਪਣੀ ਕੰਪਿਊਟਰ ਸੈਟਿੰਗਸ 'ਤੇ ਜਾਓ। ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ USB ਡਰਾਈਵ ਲਿਖਣ ਤੋਂ ਸੁਰੱਖਿਅਤ ਹੈ। ਜੇ ਇਹ ਹੈ, ਤਾਂ ਸੁਰੱਖਿਆ ਨੂੰ ਅਯੋਗ ਕਰੋ</li>\n<li>ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਪੈੱਨਡਰਾਈਵ ਵਿੱਚ ਖ਼ਾਲੀ ਥਾਂ ਹੈ। ਆਪਣੀ ਪੈੱਨਡਰਾਈਵ ਤੋਂ ਅਣਚਾਹੀਆਂ ਫਾਈਲਾਂ ਨੂੰ ਡੀਲੀਟ ਕਰੋ</li></ul>\n"
+    },
+    {
+      "topic": "ਮੈਂ ਆਪਣੀ ਪੇਨਡਰਾਈਵ 'ਤੇ ਕੰਟੇਂਟ ਲੋਡ ਕੀਤੇ ਸਨ, ਪਰ ਹੁਣ ਮੈਂ ਵੇਖਦਾ ਹਾਂ ਕਿ ਇਹ ਖ਼ਾਲੀ ਹੈ",
+      "description": "ਤੁਹਾਡੀ ਪੇਨਡਰਾਈਵ ਜਾਂ ਕੰਪਿਊਟਰ ਕਿਸੇ ਵਾਇਰਸ ਨਾਲ ਸੰਕਰਮਿਤ ਹੋ ਸਕਦਾ ਹੈ। ਇਹ ਵੇਖੋ ਕਿ:\n* ਤੁਹਾਡੀ ਮਸ਼ੀਨ 'ਤੇ ਇਕ ਐਂਟੀ ਵਾਇਰਸ ਸਾਫਟਵੇਅਰ ਸਥਾਪਤ ਹੈ\n* ਤੁਹਾਡੀ ਪੇਨਡਰਾਈਵ ਨੂੰ ਅਣਜਾਣ ਮਸ਼ੀਨਾਂ ਵਿਚ ਲਗਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਲਿਖਤ-ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਗਿਆ ਹੈ"
+    },
+    {
+      "topic": "ਮੇਰੀ ਪੇਨਡਰਾਈਵ 'ਤੇ ਅਤੇ ਪੇਨਡਰਾਈਵ ਤੋਂ ਕੰਟੇਂਟ ਦੀ ਨਕਲ ਕਰਨ ਲਈ ਸਮਾਂ ਲਗਦਾ ਹੈ",
+      "description": "ਕਾਪੀ ਕਰਨ ਲਈ ਲਿਆ ਗਿਆ ਸਮਾਂ ਕੰਟੇਂਟ ਫਾਈਲ ਦੇ ਅਕਾਰ 'ਤੇ ਨਿਰਭਰ ਕਰਦਾ ਹੈ। ਕੁਝ ਵੱਡੀਆਂ ਪਾਠ-ਪੁਸਤਕਾਂ ਦੀ ਨਕਲ ਕਰਨ ਲਈ ਸਮਾਂ ਲੱਗਦਾ ਹੈ। ਅਸੀਂ ਤੁਹਾਨੂੰ ਸਿਫਾਰਸ਼ ਕਰਦੇ ਹਾਂ ਕਿ ਤੁਸੀਂ ਪ੍ਰਕਿਰਿਆ ਨੂੰ ਵਿਚਕਾਰ ਨਾ ਰੋਕੋ। ਅਜਿਹਾ ਕਰਨ ਨਾਲ ਅਸੰਗਤ ਫਾਈਲਾਂ ਲੱਗ ਸਕਦੀਆਂ ਹਨ।"
+    },
+    {
+      "topic": "ਮੇਰੇ ਕੰਪਿਊਟਰ ਵਿੱਚ DIKSHA ਕੰਟੇਂਟ ਕਾਰਨ ਕੋਈ ਖ਼ਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ",
+      "description": "ਆਪਣੇ ਕੰਪਿਊਟਰ 'ਤੇ ਜਗ੍ਹਾ ਖ਼ਾਲੀ ਕਰਨ ਲਈ ਐਪ ਦੀ ਮਾਈ ਡਾਊਨਲੋਡਸ ਟੈਬ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੇ ਕੰਟੇਂਟ ਨੂੰ ਡੀਲੀਟ ਕਰੋ"
+    },
+    {
+      "topic": "ਮੇਰੇ ਉਬੰਤੂ ਸਿਸਟਮ 'ਤੇ DIKSHA ਡੈਸਕਟਾਪ ਐਪਲੀਕੇਸ਼ਨ ਸਥਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ",
+      "description": "<p>ਆਪਣੇ ਉਬੰਤੂ ਸਿਸਟਮ 'ਤੇ DIKSHA ਡੈਸਕਟਾਪ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਸਥਾਪਤ ਕਰਨ ਲਈ:</p>\n<p>1) ਆਪਣਾ ਟਰਮੀਨਲ ਖੋਲ੍ਹੋ</p>\n<p>2) ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਲਈ ਸੀਡੀ <ਲੋਕੇਸ਼ਨ> ਕਮਾਂਡ ਚਲਾਓ, ਜਿੱਥੇ exe ਫਾਈਲ ਡਾਊਨਲੋਡ ਕੀਤੀ ਗਈ ਹੈ। ਉਦਾਹਰਣ ਲਈ, ਜੇ exe ਨੂੰ ਡਾਊਨਲੋਡਸ ਫੋਲਡਰ ਵਿੱਚ ਸੇਵ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ ਸੀਡੀ ਡਾਊਨਲੋਡਸ ਕਮਾਂਡ ਚਲਾਓ</p>\n<p>3) sudo dpkg -i <ਫਾਈਲ ਦਾ ਨਾਮ>ਕਮਾਂਡ ਚਲਾਓ </p>\n<p>ਇਸ ਕਮਾਂਡ ਨੂੰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਚਲਾਉਣ 'ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਲਾਂਚ ਹੋ ਜਾਂਦੀ ਹੈ </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "ਅੱਖਰ ਬਚੇ",
+    "explainMsg": "ਕੀ ਤੁਸੀਂ ਸਮੱਸਿਆ ਬਾਰੇ ਦੱਸ ਸਕਦੇ ਹੋ?",
+    "faqMsg": "ਅਕਸਰ ਪੁੱਛੇ ਜਾਣ ਵਾਲੇ ਸਵਾਲ",
+    "help": "ਮਦਦ ",
+    "helpMsg": "ਕੀ ਇਸ ਜਵਾਬ ਨੇ ਤੁਹਾਡੀ ਮਦਦ ਕੀਤੀ?",
+    "initiateEmailButton": "ਈਮੇਲ ਅਰੰਭ ਕਰੋ",
+    "knowMoreMsg": "ਤੁਸੀਂ ਹੋਰ ਕੀ ਜਾਣਨਾ ਚਾਹੋਗੇ?",
+    "noMsg": "ਨਹੀਂ",
+    "reportIssue": " ਮੁੱਦੇ ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
+    "reportIssueMsg": "ਹੋਰ ਮੁੱਦੇ ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
+    "resolveMsg": "ਆਪਣੇ ਮੁੱਦੇ ਨੂੰ ਸੁਲਝਾਉਣ ਲਈ ਸੂਚੀ ਨੂੰ ਵੇਖੋ",
+    "sorryMsg": "ਉਸ ਲਈ ਮੈ ਅਫ਼ਸੋਸ ਕਰਦਾਂ!",
+    "submitButton": "ਜਮ੍ਹਾ ਕਰੋ",
+    "tellMoreMsg": "ਆਪਣੀਆ ਸਮੱਸਿਆ ਦੇ ਬਾਰੇ ਸਾਨੂੰ ਹੋਰ ਦੱਸੋ",
+    "thanksMsg": "ਤੁਹਾਡੇ ਜਵਾਬ ਲਈ ਧੰਨਵਾਦ!",
+    "triggerEmailMsg": "ਟੈਕਸਟ ਬਾਕਸ ਵਿੱਚ ਵੇਰਵੇ ਸ਼ਾਮਲ ਕਰਨ ਅਤੇ ਈਮੇਲ ਅਰੰਭ ਬਟਨ ਨੂੰ ਟੈਪ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਅਸੀਂ ਤੁਹਾਡੇ ਵੱਲੋਂ ਇਕ ਈਮੇਲ ਜਾਰੀ ਕਰਾਂਗੇ।ਤੁਸੀਂ ਇਸ ਈਮੇਲ ਵਿੱਚ ਹੋਰ ਵੇਰਵੇ ਅਤੇ /ਜਾਂ ਫਾਈਲਾਂ ਨੂੰ ਇੱਥੇ ਜੋੜ ਸਕਦੇ ਹੋ।",
+    "typeHere": "ਇੱਥੇ ਟਾਈਪ ਕਰੋ ...",
+    "yesMsg": "ਹਾਂ"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-ta.json b/utils/DesktopFAQ/faq-ta.json
new file mode 100644
index 000000000..73ac9b753
--- /dev/null
+++ b/utils/DesktopFAQ/faq-ta.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "எனது வாரியம், மொழி வழி கல்வி, வகுப்பு மற்றும் தலைப்பு ஆகியவற்றை என்னால் பார்க்க முடியவில்லை ",
+      "description": "உங்கள் மாநிலம் தற்போது அனைத்து வாரியங்கள், ஊடகங்கள், வகுப்புகள் மற்றும் பாடங்களை ஆதரிக்கவில்லை. உங்கள் மாநிலம் அவற்றைச் சேர்த்தவுடன், அதை நீங்கள் பட்டியலில் காண்பீர்கள்"
+    },
+    {
+      "topic": "நான் உள்ளடக்கத்தைப் பதிவிறக்கம் செய்தேன், ஆனால் எனக்கு இணையம் தேவை என்று கூறியதால் என்னால் அதை இயக்க முடியவில்லை",
+      "description": "நீங்கள் YouTube உள்ளடக்கத்தை பதிவிறக்கம் செய்திருக்கலாம். நீங்கள் ஆன்லைனில் இருக்கும்போது மட்டுமே YouTube உள்ளடக்கத்தை இயக்க முடியும். கணினியை இணையத்துடன் இணைக்க மீண்டும் முயற்சிக்கவும்."
+    },
+    {
+      "topic": "எனது DIKSHA டெஸ்க்டாப் செயலியை புதுப்பிக்க வேண்டும்",
+      "description": "உங்கள் கணினியை இணையத்துடன் இணைத்து, சமீபத்திய பயன்பாட்டு பதிப்பிற்காக https://staging.sunbirded.org/desktop/latest க்கு செல்லவும் "
+    },
+    {
+      "topic": "இணைய இணைப்புடன் மடிக்கணினிக்கு அணுகல் இல்லை, ஆனால் டெஸ்க்டாப் செயலியில் உள்ளடக்கத்தை சேர்க்க அல்லது புதுப்பிக்க விரும்புகிறேன்",
+      "description": "உங்களிடம் கைப்பேசி இருந்தால், கூகிள் பிளேஸ்டோரிலிருந்து DIKSHA மொபைல் செயலியை பதிவிறக்கவும். செயலியில் உள்ள உள்ளடக்கத்திற்காக உலாவுக. DIKSHA நூலகத்திலிருந்து உள்ளடக்கத்தைப் பதிவிறக்கவும். பென்ட்ரைவ் அல்லது எஸ்டி கார்டில் நகலெடுத்து அதை DIKSHA டெஸ்க்டாப் செயலியில் பதிவேற்றவும்."
+    },
+    {
+      "topic": "ஒரு குறிப்பிட்ட தலைப்புக்கான உள்ளடக்கம் கிடைக்கவில்லை, அல்லது பொருத்தமற்ற உள்ளடக்கத்தைக் காண்கிறேன்",
+      "description": "உள்ளடக்கத்தைத் தேட DIKSHA இன் ஆன்லைன் நூலகத்தை உலாவுக. இது இன்னும் கிடைக்கவில்லை என்றால், உள்ளடக்கத்தைப் பற்றிய உங்கள் கருத்தை மாநில SCERT க்கு அனுப்புங்கள்"
+    },
+    {
+      "topic": "பயன்பாடு மிகவும் மெதுவாக உள்ளது",
+      "description": "செயலியின் செயல்திறனை விரைவுபடுத்த, பின்வருவனவற்றைச் செய்யுங்கள்: <br> உங்கள் கணினியின் கணினி உள்ளமைவுக்குச் செல்லவும். குறைந்தபட்ச உள்ளமைவு இருக்க வேண்டும்: <ul> <li> 2 ஜிபி ரேம் </li> <li> இரட்டை கோர் செயலி </li> </ul> <br> உங்கள் கணினி இந்த உள்ளமைவுடன் பொருந்தினால் அல்லது மீறினால், பயன்பாட்டை மறுதொடக்கம் செய்யுங்கள். <br> இதைச் செய்தபின், அது இன்னும் மெதுவாக இருந்தால், <b> பணி நிர்வாகி </b> க்குச் சென்று, பயன்படுத்தப்படாத அனைத்து பின்னணி செயல்முறைகளையும் தேர்ந்தெடுத்து <b> பணியை முடிக்க </b> என்பதைக் கிளிக் செய்க"
+    },
+    {
+      "topic": "பென்ட்ரைவிற்கு உள்ளடக்கத்தை நகலெடுக்க என்னால் முடியவில்லை",
+      "description": "உள்ளடக்கத்தை பென் டிரைவில் நகலெடுக்க, பின்வருவனவற்றைச் செய்யுங்கள்: <ul> <li> உங்கள் கணினி அமைப்புகளுக்குச் செல்லவும். யூ.எஸ்.பி டிரைவ் எழுத-பாதுகாக்கப்பட்டதா என சரிபார்க்கவும். அது இருந்தால், பாதுகாப்பை முடக்கவும் </li> <li> பென் டிரைவிற்கு இலவச இடம் இருக்கிறதா என்று சோதிக்கவும். பென்ட்ரைவிலிருந்து தேவையற்ற கோப்புகளை நீக்கு </li> </ul>"
+    },
+    {
+      "topic": "எனது பென்ட்ரைவில் உள்ளடக்கத்தை ஏற்றினேன், ஆனால் இப்போது அது காலியாக இருப்பதைக் காண்கிறேன்",
+      "description": "உங்கள் பென்ட்ரைவ் அல்லது கணினி வைரஸால் பாதிக்கப்படலாம். இதைச் சரிபார்க்கவும்: * உங்கள் கணினியில் ஒரு வைரஸ் எதிர்ப்பு மென்பொருள் நிறுவப்பட்டுள்ளது * நீங்கள் அறியப்படாத கணினிகளில் செருகுவதற்கு முன்பு உங்கள் பென்ட்ரைவ் எழுத-பாதுகாக்கப்படுகிறது"
+    },
+    {
+      "topic": "எனது பென்ட்ரைவிலிருந்து உள்ளடக்கத்தை நகலெடுக்க நேரம் எடுக்கும்",
+      "description": "நகலெடுக்க எடுக்கப்பட்ட நேரம் உள்ளடக்கக் கோப்பின் அளவைப் பொறுத்தது. சில பெரிய பாடப்புத்தகங்கள் நகலெடுக்க நேரம் எடுக்கும். இடையில் செயல்பாட்டை நிறுத்த வேண்டாம் என்று நாங்கள் பரிந்துரைக்கிறோம். அவ்வாறு செய்வது சீரற்ற கோப்புகளுக்கு வழிவகுக்கும்."
+    },
+    {
+      "topic": "DIKSHA உள்ளடக்கம் காரணமாக எனது கணினியில் இடம் இல்லை",
+      "description": "உங்கள் கணினியில் இடத்தை விடுவிக்க பயன்பாட்டின் எனது பதிவிறக்கங்கள் தாவலில் இருந்து பதிவிறக்கம் செய்யப்பட்ட உள்ளடக்கத்தை நீக்கு"
+    },
+    {
+      "topic": "எனது உபுண்டு கணினியில் DIKSHA டெஸ்க்டாப் செயலியை நிறுவ முடியவில்லை",
+      "description": "<p> உங்கள் உபுண்டு கணினியில் DIKSHA டெஸ்க்டாப் செயலியை நிறுவ: </ p> <p> 1) உங்கள் டெர்மினல் திறக்கவும் </p> <p> 2) கோப்பகத்தை exe கோப்பு இருக்கும் இடத்திற்கு மாற்ற cd <location> கட்டளையை இயக்கவும் பதிவிறக்கம் செய்யப்பட்டது. எடுத்துக்காட்டாக, பதிவிறக்க கோப்புறையில் exe சேமிக்கப்பட்டால், cd பதிவிறக்கங்கள் </p> <p> 3) கட்டளையை இயக்கவும் sudo dpkg -i <filename> </p> <p> இந்த கட்டளையை வெற்றிகரமாக இயக்கும் போது பயன்பாடு தொடங்கப்பட்டது </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "விடுபட்ட எழுத்துக்கள்",
+    "explainMsg": "பிரச்சனையை நீங்கள் விளக்க முடியுமா?",
+    "faqMsg": "அடிக்கடி கேட்கப்படும் கேள்விகள்",
+    "help": "உதவி",
+    "helpMsg": "இந்த பதில் உங்களுக்கு உதவியதா?",
+    "initiateEmailButton": "மின்னஞ்சல் தொடங்குக",
+    "knowMoreMsg": "நீங்கள் இன்னும் தெரிந்து கொள்ள விரும்புகிறீர்களா?",
+    "noMsg": "இல்லை",
+    "reportIssue": "சிக்கலைப் புகாரளி",
+    "reportIssueMsg": "பிற சிக்கலைப் புகாரளி",
+    "resolveMsg": "உங்கள் சிக்கலை தீர்க்க பட்டியலை பாருங்கள்",
+    "sorryMsg": "மன்னிக்கவும்!",
+    "submitButton": "சமர்ப்பி",
+    "tellMoreMsg": "நீங்கள் சந்தித்த பிரச்சனை பற்றி மேலும் சொல்லுங்கள்",
+    "thanksMsg": "உங்கள் பதிலுக்கு நன்றி!",
+    "triggerEmailMsg": "நீங்கள் உரை பெட்டியில் விவரங்களைச் சேர்த்து, மின்னஞ்சல் தொடங்குக பொத்தானைத் தட்டவும், உங்கள் சார்பாக ஒரு மின்னஞ்சலை தூண்டுகிறோம். நீங்கள் மேலும் விவரங்களைச் சேர்க்க மற்றும் / அல்லது அங்கு கோப்புகளை இணைக்க முடியும்.",
+    "typeHere": "இங்கே உள்ளிடவும் ...",
+    "yesMsg": "ஆம்"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-te.json b/utils/DesktopFAQ/faq-te.json
new file mode 100644
index 000000000..dc7b45332
--- /dev/null
+++ b/utils/DesktopFAQ/faq-te.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "నా బోర్డు, మీడియం, క్లాస్ మరియు సబ్జెక్టును నేను చూడలేను",
+      "description": "మీ రాష్ట్రం ప్రస్తుతం అన్ని బోర్డులు, మాధ్యమాలు, తరగతులు మరియు విషయాలకు మద్దతు ఇవ్వదు. మీ రాష్ట్రం వాటిని జోడించిన వెంటనే, మీరు దానిని జాబితాలో చూస్తారు"
+    },
+    {
+      "topic": "నేను కంటెంట్‌ను డౌన్‌లోడ్ చేసాను, కాని నేను దీన్ని ప్లే చేయలేకపోతున్నాను ఎందుకంటే నాకు ఇంటర్నెట్ అవసరం అని చెప్పింది",
+      "description": "మీరు యూట్యూబ్ కంటెంట్‌ను డౌన్‌లోడ్ చేసి ఉండవచ్చు. మీరు ఆన్‌లైన్‌లో ఉన్నప్పుడు మాత్రమే మీరు యూట్యూబ్ కంటెంట్‌ను ప్లే చేయవచ్చు. కంప్యూటర్‌ను ఇంటర్నెట్‌కు కనెక్ట్ చేయండి మళ్లీ ప్రయత్నించండి."
+    },
+    {
+      "topic": "నేను నా DIKSHA డెస్క్‌టాప్ అనువర్తనాన్ని నవీకరించాలి",
+      "description": "మీ కంప్యూటర్‌ను ఇంటర్నెట్‌కు కనెక్ట్ చేయండి మరియు తాజా అనువర్తన సంస్కరణ కోసం https://staging.sunbirded.org/desktop/latest ని తనిఖీ చేయండి"
+    },
+    {
+      "topic": "నాకు ఇంటర్నెట్ కనెక్షన్ ఉన్న ల్యాప్‌టాప్‌కు ప్రాప్యత లేదు, కానీ నేను డెస్క్‌టాప్ అనువర్తనంలో కంటెంట్‌ను జోడించాలనుకుంటున్నాను లేదా నవీకరించాలనుకుంటున్నాను",
+      "description": "మీకు మొబైల్ ఫోన్ ఉంటే, గూగుల్ ప్లేస్టోర్ నుండి DIKSHA మొబైల్ అనువర్తనాన్ని డౌన్‌లోడ్ చేయండి.\n అనువర్తనంలోని కంటెంట్ కోసం బ్రౌజ్ చేయండి.\n DIKSHA లైబ్రరీ నుండి కంటెంట్‌ను డౌన్‌లోడ్ చేయండి.\n దీన్ని పెన్‌డ్రైవ్ లేదా SD కార్డ్‌లో కాపీ చేసి, DIKSHA డెస్క్‌టాప్ అనువర్తనానికి అప్‌లోడ్ చేయండి."
+    },
+    {
+      "topic": "నేను ఒక నిర్దిష్ట అంశం కోసం కంటెంట్‌ను కనుగొనలేదు, లేదా కంటెంట్ అసంబద్ధం అని నేను భావిస్తున్నాను",
+      "description": "కంటెంట్ కోసం శోధించడానికి DIKSHA యొక్క ఆన్‌లైన్ లైబ్రరీని బ్రౌజ్ చేయండి. ఇది ఇప్పటికీ అందుబాటులో లేకపోతే, కంటెంట్ గురించి మీ అభిప్రాయాన్ని స్టేట్ SCERT కి పంపండి"
+    },
+    {
+      "topic": "అనువర్తనం చాలా నెమ్మదిగా ఉంది",
+      "description": "అనువర్తన పనితీరును వేగవంతం చేయడానికి, కింది వాటిని చేయండి:\n <br> మీ కంప్యూటర్ సిస్టమ్ కాన్ఫిగరేషన్‌కు వెళ్లండి. కనీస కాన్ఫిగరేషన్ ఉండాలి:\n <ul> <li> 2 GB RAM </li>\n <li> ద్వంద్వ కోర్ ప్రాసెసర్ </ li> </ul>\n <br> మీ కంప్యూటర్ ఈ కాన్ఫిగరేషన్‌తో సరిపోలితే లేదా మించి ఉంటే, అనువర్తనాన్ని మళ్ళీ ప్రారంభించండి.\n <br> దీన్ని చేసిన తర్వాత, అది ఇంకా నెమ్మదిగా ఉంటే, <b> టాస్క్ మేనేజర్ </b> కు వెళ్లండి,\n ఉపయోగించని అన్ని నేపథ్య ప్రక్రియలను ఎంచుకోండి మరియు <b> ఎండ్ టాస్క్ </b> క్లిక్ చేయండి"
+    },
+    {
+      "topic": "నేను పెన్‌డ్రైవ్‌కు కంటెంట్‌ను కాపీ చేయలేకపోతున్నాను",
+      "description": "పెన్ డ్రైవ్‌కు కంటెంట్‌ను కాపీ చేయడానికి, కింది వాటిని చేయండి:\n <ul> <li> మీ కంప్యూటర్ సెట్టింగ్‌లకు వెళ్లండి. USB డ్రైవ్ వ్రాసే-రక్షించబడిందో లేదో తనిఖీ చేయండి. అది ఉంటే, రక్షణను నిలిపివేయండి </li> </li>\n <li> పెన్ డ్రైవ్‌లో ఖాళీ స్థలం ఉందో లేదో తనిఖీ చేయండి. పెన్‌డ్రైవ్ నుండి అవాంఛిత ఫైల్‌లను తొలగించండి </li> </ul>"
+    },
+    {
+      "topic": "నేను నా పెన్‌డ్రైవ్‌లో కంటెంట్‌ను లోడ్ చేసాను, కాని ఇప్పుడు అది ఖాళీగా ఉందని నేను చూశాను",
+      "description": "మీ పెన్‌డ్రైవ్ లేదా కంప్యూటర్ వైరస్ బారిన పడవచ్చు. దాన్ని తనిఖీ చేయండి:\n * మీ మెషీన్‌లో యాంటీ వైరస్ సాఫ్ట్‌వేర్ ఇన్‌స్టాల్ చేయబడింది\n * మీరు తెలియని యంత్రాలలో ప్లగ్ చేయడానికి ముందు మీ పెన్‌డ్రైవ్ వ్రాతపూర్వకంగా రక్షించబడుతుంది"
+    },
+    {
+      "topic": "నా పెన్‌డ్రైవ్‌కు మరియు నుండి కంటెంట్‌ను కాపీ చేయడానికి సమయం పడుతుంది",
+      "description": "కాపీ చేయడానికి తీసుకున్న సమయం కంటెంట్ ఫైల్ పరిమాణంపై ఆధారపడి ఉంటుంది. కొన్ని పెద్ద పాఠ్యపుస్తకాలు కాపీ చేయడానికి సమయం పడుతుంది. ఈ ప్రక్రియను మీరు మధ్యలో ఆపవద్దని మేము సిఫార్సు చేస్తున్నాము. అలా చేయడం వలన అస్థిరమైన ఫైళ్లు ఏర్పడవచ్చు."
+    },
+    {
+      "topic": "DIKSHA కంటెంట్ కారణంగా నా కంప్యూటర్‌కు ఖాళీ స్థలం లేదు",
+      "description": "మీ కంప్యూటర్‌లో ఖాళీ స్థలం కోసం ఖాళీ చేయడానికి అనువర్తనం యొక్క నా డౌన్‌లోడ్ ట్యాబ్ నుండి డౌన్‌లోడ్ చేసిన కంటెంట్‌ను తొలగించండి"
+    },
+    {
+      "topic": "నా ఉబుంటు సిస్టమ్‌లో DIKSHA డెస్క్‌టాప్ అప్లికేషన్‌ను ఇన్‌స్టాల్ చేయడం సాధ్యం కాలేదు",
+      "description": "> మీ ఉబుంటు సిస్టమ్‌లో DIKSHA డెస్క్‌టాప్ అప్లికేషన్‌ను ఇన్‌స్టాల్ చేయడానికి: </p>\n <p> 1) మీ టెర్మినల్ తెరవండి </p>\n <p> 2)cd ఆదేశాన్ని అమలు చేయండి <location> డైరెక్టరీని exe ఫైల్ డౌన్‌లోడ్ చేయబడిన చోటికి మార్చడానికి. ఉదాహరణకు, డౌన్‌లోడ్ ఫోల్డర్‌లో exe సేవ్ చేయబడితే, cd డౌన్‌లోడ్‌లు ఆదేశాన్ని అమలు చేయండి</p> \n <p> 3) sudo dpkg -i <filename> ఆదేశాన్ని అమలు చేయండి</p>\n <p> ఈ ఆదేశాన్ని విజయవంతంగా అమలు చేస్తున్నప్పుడు అప్లికేషన్ ప్రారంభించబడింది </p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "అక్షరాలు మిగిలి ఉన్నాయి",
+    "explainMsg": "మీరు సమస్యను వివరించగలరా?",
+    "faqMsg": "తరచుగా అడిగే ప్రశ్నలు",
+    "help": "సహాయం కావాలి",
+    "helpMsg": "ఈ సమాధానం మీకు సహాయపడిందా?",
+    "initiateEmailButton": "ఇమెయిల్ను ప్రారంభించండి",
+    "knowMoreMsg": "మీరు మరింత తెలుసుకోవాలనుకుంటున్న విషయం ఏంటి?",
+    "noMsg": "కాదు",
+    "reportIssue": "సమస్యను నివేదించండి",
+    "reportIssueMsg": "ఇతర సమస్యను నివేదించండి",
+    "resolveMsg": "మీ సమస్యను పరిష్కరించడానికి జాబితాను చూడండి",
+    "sorryMsg": "అలా జరిగినందుకు క్షమించండి!",
+    "submitButton": "సమర్పించండి",
+    "tellMoreMsg": "మీరు ఎదుర్కొన్న సమస్య గురించి మాకు మరింత తెలియజేయండి",
+    "thanksMsg": "మీ ప్రతిస్పందన కోసం ధన్యవాదాలు!",
+    "triggerEmailMsg": "మీరు టెక్స్ట్ బాక్స్లో వివరాలను జోడించి, ఇమెయిల్(Initiate) బటన్ను నొక్కితే, మీ తరపున మేము ఒక ఇమెయిల్ను ప్రేరేపిస్తాము. మీరు మరింత వివరాలను జోడించవచ్చు మరియు / లేదా అక్కడ ఫైల్లను అటాచ్ చేయవచ్చు.",
+    "typeHere": "ఇక్కడ టైపు చేయండి..",
+    "yesMsg": "అవును"
+  }
+}
\ No newline at end of file
diff --git a/utils/DesktopFAQ/faq-ur.json b/utils/DesktopFAQ/faq-ur.json
new file mode 100644
index 000000000..71445fd94
--- /dev/null
+++ b/utils/DesktopFAQ/faq-ur.json
@@ -0,0 +1,68 @@
+{
+  "faqs": [
+    {
+      "topic": "میں اپنا بورڈ ، میڈیم ، کلاس اور سبجیکٹ نہیں دیکھ سکتا ہوں",
+      "description": "آپ کی ریاست فی الحال تمام بورڈ ، میڈیم ، کلاس اور مضامین کی حمایت نہیں کرتی ہے۔ جیسے ہی آپ کی ریاست نے ان کو شامل کیا ، آپ اسے فہرست میں دیکھیں گے"
+    },
+    {
+      "topic": "میں نے یہ مواد ڈاؤن لوڈ کیا ہے ، لیکن میں اسے کھولنے سے قاصر ہوں کیونکہ اس کے مطابق مجھے انٹرنیٹ کی ضرورت ہے",
+      "description": "ہوسکتا ہے کہ آپ نے YouTube کا مواد ڈاؤن لوڈ کیا ہو۔ جب آپ آن لائن ہوں تو آپ YouTube کا مواد کھول سکتے ہیں۔ کمپیوٹر کو دوبارہ انٹرنیٹ سے جوڑنے کی کوشش کریں۔"
+    },
+    {
+      "topic": "مجھے اپنی DIKSHA ڈیسک ٹاپ ایپ کو اپ ڈیٹ کرنے کی ضرورت ہے",
+      "description": "اپنے کمپیوٹر کو انٹرنیٹ سے جڑیں اور‪https://staging.sunbirded.org/desktop/latest‬ پر جدید ایپ ورژن کے لئے چیک کریں"
+    },
+    {
+      "topic": "مجھے انٹرنیٹ کنیکشن والے لیپ ٹاپ تک رسائی حاصل نہیں ہے ، لیکن میں ڈیسک ٹاپ ایپ پر مواد شامل یا اپ ڈیٹ کرنا چاہتا ہوں",
+      "description": "اگر آپ کے پاس موبائل فون ہے تو ، گوگل پلے اسٹور سے DIKSHA موبائل اپلی کیشن ڈاؤن لوڈ کریں۔\nایپ میں موجود مواد کے لئے براؤز کریں۔\nDIKSHA لائبریری سے مواد ڈاؤن لوڈ کریں۔\nاسے PenDrive یا SD کارڈ میں کاپی کریں اور DIKSHA ڈیسک ٹاپ ایپ پر اپ لوڈ کریں۔"
+    },
+    {
+      "topic": "مجھے کسی خاص عنوان کے لئے مواد نہیں ملتا ہے ، یا مجھے یہ مواد غیر متعلق معلوم ہوتا ہے",
+      "description": "مواد کی تلاش کے لئے DIKSHA کی آن لائن لائبریری کو براؤز کریں۔ اگر یہ ابھی بھی دستیاب نہیں ہے تو، مواد کے بارے میں اپنی رائے اسٹیٹ SCERT کو بھیجیں"
+    },
+    {
+      "topic": "ایپ بہت آہستہ ہے",
+      "description": "ایپ کی کارکردگی کو تیز کرنے کے لئے ، درج ذیل کام کریں:\n<br>اپنے کمپیوٹر سسٹم کی تشکیل پر جائیں.کم از کم ترتیب یہ ہونی چاہئے:\n‪<li/>2 GB RAM<li>‬‪<ul>‬\n‪<li/>ڈبل کور پروسیسر<li>‬\n</ul>\n<br>اگر آپ کا کمپیوٹر اس ترتیب سے میچ کرتا ہے یا اس سے زیادہ ہے تو ، ایپ کو دوبارہ شروع کریں۔\n<br>ایسا کرنے کے بعد ، اگر یہ اب بھی آہستہ ہے ، تو<b>ٹاسک مینیجر</b>کے پاس جاؤ\nغیر استعمال شدہ پس منظر کے تمام عمل منتخب کریں اور<b>اینڈ ٹاسک</b>پر کلک کریں"
+    },
+    {
+      "topic": "میں پین ڈرائیو میں مواد کو کاپی کرنے سے قاصر ہوں",
+      "description": "پین ڈرائیو میں مواد کی کاپی کرنے کے لئے ، درج ذیل کریں:\n<ul>\n<li>اپنے کمپیوٹر کی ترتیبات پر جائیں۔ چیک کریں کہ USB ڈرائیو کو تحریری شکل سے محفوظ ہے یا نہیں۔ اگر ایسا ہے تو ، تحفظ کو غیر فعال کریں </ li>\n<li> چیک کریں کہ پین ڈرائیو میں خالی جگہ ہے یا نہیں ۔ پین ڈرائیو سے ناپسندیدہ فائلوں کو حذف کریں</li>\n</ul>"
+    },
+    {
+      "topic": "میں نے اپنی پین ڈرائیو پر موجود مواد کو لوڈ کیا ، لیکن اب میں دیکھ رہا ہوں کہ یہ خالی ہے",
+      "description": "آپ کا پینڈرایو یا کمپیوٹر کسی وائرس سے متاثر ہوسکتا ہے۔چیک کریں کہ:\n* آپ کی مشین پر ایک اینٹی وائرس سوفٹویئر نصب ہے\n* آپ کی پینڈرائیو نامعلوم مشینوں میں پلگ کرنے سے پہلے تحریری طور پر محفوظ ہے"
+    },
+    {
+      "topic": "میرے پین ڈرائیو پر اور اس سے مواد کو کاپی کرنے میں وقت لگتا ہے",
+      "description": "کاپی کرنے میں جو وقت لیا گیا ہے اس کا انحصار مواد کی فائل کے سائز پر ہوتا ہے۔ کچھ بڑی درسی کتب کاپی کرنے میں وقت لگتا ہے۔ ہمارا مشورہ ہے کہ آپ اس عمل میں مداخلت نہ کریں۔ ایسا کرنے سے متضاد فائلیں پیدا ہوسکتی ہیں۔"
+    },
+    {
+      "topic": "میرے کمپیوٹر میں DIKSHA مشمولات کی وجہ سے کوئی خالی جگہ نہیں ہے",
+      "description": "اپنے کمپیوٹر پر جگہ خالی کرنے کے لئے ایپ کے میرے ڈاؤن لوڈ والے ٹیب سے ڈاؤن لوڈ کردہ مواد کو ہٹا دیں"
+    },
+    {
+      "topic": "میرے Ubuntu سسٹم پر DIKSHA ڈیسک ٹاپ ایپلی کیشن انسٹال کرنے سے قاصر ہے",
+      "description": "<p>میرے Ubuntu سسٹم پر DIKSHA ڈیسک ٹاپ ایپلی کیشن انسٹال کرنے کے لئے:</p>\n<p> اپنا ٹرمینل کھولیں </ p>\n<p> ڈائرکٹری تبدیل کرنے کے لئے سی ڈی کمانڈ چلائیں<مقام>جہاں exe فائل ڈاؤن لوڈ کی گئی ہے.مثال کے طور پر ، اگر ڈاؤن لوڈز فولڈر میں exe کو محفوظ کیا گیا ہے تو ، پھر سی ڈی ڈاؤن لوڈ کمانڈ چلائیں</p>\n<p>کمانڈ sudo dpkg-i چلائیں<filename>\n</p>\n<p> اس کمانڈ کو کامیابی کے ساتھ چلانے پر ایپلیکیشن لانچ کی جاتی ہے </ p>"
+    }
+  ],
+  "constants": {
+    "charactersLeft": "حروف باقی ہیں",
+    "explainMsg": "کیا آپ اس مسئلے کو سمجھا سکے؟",
+    "faqMsg": "اکثر پوچھے گئے سوالات",
+    "help": "مدد",
+    "helpMsg": "کیا اس جواب نے آ پکی مدد کی؟",
+    "initiateEmailButton": "ای میل شروع کریں",
+    "knowMoreMsg": "آپ اور کیا جاننا چاہتے ہے؟",
+    "noMsg": "نہیں",
+    "reportIssue": "مسئلہ کی اطلاع دیں",
+    "reportIssueMsg": "دوسرے مسئلے کی اطلاع دیں",
+    "resolveMsg": "اپنے مسئلے کو حل کرنے کے لۓ فہرست دیکھیں",
+    "sorryMsg": "اس کے لئے معذرت!",
+    "submitButton": "جمع کریں",
+    "tellMoreMsg": "ہمیں اس مسئلے کے بارے میں مزید بتائیے",
+    "thanksMsg": "آپکے جواب کا شکریہ!",
+    "triggerEmailMsg": "ٹیکسٹ باکس میں تفصیلات شامل کرنے کے بعد اور ابتدائی ای میل بٹن کو شروع کرنے کے بعد، ہم آپ کی طرف سے ایک ای میل کو متحرک کریں گے. آپ مزید تفصیلات شامل کر سکتے ہیں اور / یا وہاں فائلیں منسلک کرسکتے ہیں.",
+    "typeHere": "یہاں ٹائپ کریں ...",
+    "yesMsg": "جی ہاں"
+  }
+}
\ No newline at end of file

From 5192fdb34907ab7abb18c4340882dcb0d1ca975f Mon Sep 17 00:00:00 2001
From: keshavprasadms <msknext@gmail.com>
Date: Fri, 11 Dec 2020 17:59:21 +0530
Subject: [PATCH 068/184] fix: updating main deploy file to keycloak 3,
 removing unused vars

---
 .../keycloak-deploy-6.0/defaults/main.yml     |   86 +
 .../files/python-keycloak-0.12.0/PKG-INFO     |   19 +
 .../files/python-keycloak-0.12.0/README.md    |  210 ++
 .../keycloak-realm.json                       | 1999 +++++++++++++
 .../keycloak/__init__.py                      |   19 +
 .../keycloak/authorization/__init__.py        |   87 +
 .../keycloak/authorization/permission.py      |   98 +
 .../keycloak/authorization/policy.py          |  107 +
 .../keycloak/authorization/role.py            |   39 +
 .../keycloak/connection.py                    |  199 ++
 .../keycloak/exceptions.py                    |   93 +
 .../keycloak/keycloak_admin.py                |  670 +++++
 .../keycloak/keycloak_main.py                 |   89 +
 .../keycloak/keycloak_openid.py               |  390 +++
 .../keycloak/keycloak_patch.py                |   54 +
 .../python_keycloak.egg-info/PKG-INFO         |   18 +
 .../python_keycloak.egg-info/SOURCES.txt      |    0
 .../dependency_links.txt                      |    1 +
 .../python_keycloak.egg-info/requires.txt     |    3 +
 .../python_keycloak.egg-info/top_level.txt    |    1 +
 .../keycloak/tests/__init__.py                |    0
 .../keycloak/tests/test_connection.py         |  148 +
 .../keycloak/urls_patterns.py                 |   54 +
 .../python_keycloak.egg-info/PKG-INFO         |   18 +
 .../python_keycloak.egg-info/SOURCES.txt      |   21 +
 .../dependency_links.txt                      |    1 +
 .../python_keycloak.egg-info/requires.txt     |    3 +
 .../python_keycloak.egg-info/top_level.txt    |    1 +
 .../files/python-keycloak-0.12.0/roles.json   |   41 +
 .../files/python-keycloak-0.12.0/setup.cfg    |    7 +
 .../files/python-keycloak-0.12.0/setup.py     |   25 +
 .../keycloak-deploy-6.0/tasks/bootstrap.yml   |   91 +
 .../keycloak-deploy-6.0/tasks/custom.yml      |   62 +
 .../keycloak-deploy-6.0/tasks/deploy.yml      |  205 ++
 .../roles/keycloak-deploy-6.0/tasks/main.yml  |   13 +
 .../templates/Msg91Creds.json.j2              |    7 +
 .../keycloak-deploy-6.0/templates/clients.j2  |  262 ++
 .../templates/clients.json                    |  262 ++
 .../templates/keycloak-bootstrap.conf.j2      |   14 +
 .../templates/keycloak-realm.j2               | 2648 +++++++++++++++++
 .../templates/module.xml.j2                   |   10 +
 .../templates/standalone-ha-single.xml        |    0
 .../templates/standalone-ha.xml               |  673 +++++
 .../templates/standalone.xml                  |  471 +++
 .../roles/keycloak-deploy/defaults/main.yml   |    2 +
 .../roles/keycloak-deploy/tasks/deploy.yml    |   96 +-
 .../keycloak-deploy/templates/module.xml.j2   |    2 +-
 .../templates/standalone-ha.xml               |  330 +-
 .../templates/standalone.conf.j2              |   73 +
 49 files changed, 9457 insertions(+), 265 deletions(-)
 create mode 100644 ansible/roles/keycloak-deploy-6.0/defaults/main.yml
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/PKG-INFO
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/README.md
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak-realm.json
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/__init__.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/__init__.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/permission.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/policy.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/role.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/connection.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/exceptions.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_admin.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_main.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_openid.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_patch.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/PKG-INFO
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/SOURCES.txt
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/dependency_links.txt
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/requires.txt
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/top_level.txt
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/tests/__init__.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/tests/test_connection.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/urls_patterns.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/PKG-INFO
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/SOURCES.txt
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/dependency_links.txt
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/requires.txt
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/top_level.txt
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/roles.json
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/setup.cfg
 create mode 100644 ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/setup.py
 create mode 100644 ansible/roles/keycloak-deploy-6.0/tasks/bootstrap.yml
 create mode 100644 ansible/roles/keycloak-deploy-6.0/tasks/custom.yml
 create mode 100644 ansible/roles/keycloak-deploy-6.0/tasks/deploy.yml
 create mode 100644 ansible/roles/keycloak-deploy-6.0/tasks/main.yml
 create mode 100644 ansible/roles/keycloak-deploy-6.0/templates/Msg91Creds.json.j2
 create mode 100644 ansible/roles/keycloak-deploy-6.0/templates/clients.j2
 create mode 100644 ansible/roles/keycloak-deploy-6.0/templates/clients.json
 create mode 100644 ansible/roles/keycloak-deploy-6.0/templates/keycloak-bootstrap.conf.j2
 create mode 100644 ansible/roles/keycloak-deploy-6.0/templates/keycloak-realm.j2
 create mode 100644 ansible/roles/keycloak-deploy-6.0/templates/module.xml.j2
 rename ansible/roles/{keycloak-deploy => keycloak-deploy-6.0}/templates/standalone-ha-single.xml (100%)
 create mode 100644 ansible/roles/keycloak-deploy-6.0/templates/standalone-ha.xml
 create mode 100644 ansible/roles/keycloak-deploy-6.0/templates/standalone.xml
 create mode 100644 ansible/roles/keycloak-deploy/templates/standalone.conf.j2

diff --git a/ansible/roles/keycloak-deploy-6.0/defaults/main.yml b/ansible/roles/keycloak-deploy-6.0/defaults/main.yml
new file mode 100644
index 000000000..b68604449
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/defaults/main.yml
@@ -0,0 +1,86 @@
+---
+sunbird_auth_version: 1.0v
+keycloak_pkg_src: https://downloads.jboss.org/keycloak/3.2.0.Final/keycloak-3.2.0.Final.tar.gz
+postgresql_driver_src: https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar
+keycloak_pkg_file: "keycloak-3.2.0.Final.tar.gz"
+keycloak_sms_provider_build: "keycloak-email-phone-autthenticator-1.0-SNAPSHOT.jar"
+keycloak_subsystem: '
+    <subsystem xmlns="urn:jboss:domain:keycloak-server:1.1">
+        <web-context>auth</web-context>
+    </subsystem>'
+keycloak_cache_container: '
+    <cache-container name="keycloak" jndi-name="infinispan/Keycloak">
+        <local-cache name="realms"/>
+        <local-cache name="users"/>
+        <local-cache name="sessions"/>
+        <local-cache name="offlineSessions"/>
+        <local-cache name="loginFailures"/>
+    </cache-container>'
+keycloak_default_ds: '
+    <datasource jndi-name="java:jboss/datasources/KeycloakDS"
+      pool-name="KeycloakDS" enabled="true" use-java-context="true">
+        <connection-url>
+            jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE
+        </connection-url>
+        <driver>h2</driver>
+        <security>
+            <user-name>sa</user-name>
+            <password>sa</password>
+        </security>
+    </datasource>'
+
+keycloak_ds_driver_path: "/opt/keycloak/modules/system/layers/keycloak/org/postgresql/main"
+wildfly_dir: /opt/keycloak
+keycloak_download_dir: /opt
+keycloak_download_url: https://downloads.jboss.org/keycloak/3.2.0.Final/keycloak-3.2.0.Final.tar.gz
+wildfly_user: keycloak
+wildfly_group: keycloak
+wildfly_standalone_config_path: /opt/keycloak/keycloak/standalone/configuration/standalone-ha.xml
+keycloak_ext:  <extension module="org.keycloak.keycloak-server-subsystem"/>
+keycloak_download_file: keycloak-3.2.0.Final.tar.gz
+
+keycloak_ds_driver_url: https://jdbc.postgresql.org/download/postgresql-9.2.1212.jar
+keycloak_ds_driver_name: "postgresql"
+keycloak_ds_driver_module: '
+    <?xml version="1.0" ?>
+    <module xmlns="urn:jboss:module:1.1" name="org.postgresql">
+
+        <resources>
+            <resource-root path="postgresql-42.1.1.jar"/>
+        </resources>
+
+        <dependencies>
+            <module name="javax.api"/>
+            <module name="javax.transaction.api"/>
+        </dependencies>
+    </module>'
+keycloak_custom_driver: '
+    <driver name="postgresql" module="org.postgresql">
+        <xa-datasource-class>
+            org.postgresql.xa.PGXADataSource
+        </xa-datasource-class>
+        <datasource-class>org.postgresql.ds.PGPoolingDataSource</datasource-class>
+    </driver>'
+keycloak_custom_ds: '
+    <datasource jta="true" jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-ccm="true">
+        <connection-url>jdbc:postgresql://11.0.0.6:5432/keycloak</connection-url>
+        <driver-class>org.postgresql.Driver</driver-class>
+        <driver>postgresql</driver>
+        <security>
+            <user-name>keycloak</user-name>
+            <password>KeyCloaK#2</password>
+        </security>
+        <validation>
+            <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"/>
+            <background-validation>true</background-validation>
+            <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter"/>
+        </validation>
+    </datasource>'
+
+theme: "sunrise.tar.gz"
+dest_theme: "/opt/keycloak/themes/"
+theme_file: sunrise
+keycloak_home: /opt/keycloak
+login_theme: artifacts/sunbird/login
+email_theme: artifacts/sunbird/email
+tenant_name: sunbird
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/PKG-INFO b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/PKG-INFO
new file mode 100644
index 000000000..e71b54e3b
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/PKG-INFO
@@ -0,0 +1,19 @@
+Metadata-Version: 1.1
+Name: python-keycloak
+Version: 0.12.0
+Summary: python-keycloak is a Python package providing access to the Keycloak API.
+Home-page: https://bitbucket.org/agriness/python-keycloak
+Author: Marcos Pereira
+Author-email: marcospereira.mpj@gmail.com
+License: GNU General Public License - V3
+Description-Content-Type: UNKNOWN
+Description: UNKNOWN
+Keywords: keycloak openid
+Platform: UNKNOWN
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Development Status :: 3 - Alpha
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Unix
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Topic :: Utilities
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/README.md b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/README.md
new file mode 100644
index 000000000..c6b0940b0
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/README.md
@@ -0,0 +1,210 @@
+[![Documentation Status](https://readthedocs.org/projects/python-keycloak/badge/?version=latest)](http://python-keycloak.readthedocs.io/en/latest/?badge=latest)
+
+Python Keycloak
+====================
+
+For review- see https://bitbucket.org/agriness/python-keycloak
+
+**python-keycloak** is a Python package providing access to the Keycloak API.
+
+## Installation
+
+### Via Pypi Package:
+
+``` $ pip install python-keycloak ```
+
+### Manually
+
+``` $ python setup.py install ```
+
+## Dependencies
+
+python-keycloak depends on:
+
+* Python 3
+* [requests](http://docs.python-requests.org/en/master/)
+* [python-jose](http://python-jose.readthedocs.io/en/latest/)
+
+### Tests Dependencies
+
+* unittest
+* [httmock](https://github.com/patrys/httmock)
+
+## Bug reports
+
+Please report bugs and feature requests at
+https://bitbucket.org/agriness/python-keycloak/issues
+
+## Documentation
+
+The documentation for python-keycloak is available on [readthedocs](http://python-keycloak.readthedocs.io).
+
+## Contributors
+
+* [Agriness Team](http://www.agriness.com/pt/)
+* [Marcos Pereira](marcospereira.mpj@gmail.com)
+* [Martin Devlin](martin.devlin@pearson.com) 
+* [Shon T. Urbas](shon.urbas@gmail.com>)
+
+## Usage
+
+```python
+from keycloak import KeycloakOpenID
+
+# Configure client
+keycloak_openid = KeycloakOpenID(server_url="http://localhost:8080/auth/",
+                    client_id="example_client",
+                    realm_name="example_realm",
+                    client_secret_key="secret")
+
+# Get WellKnow
+config_well_know = keycloak_openid.well_know()
+
+# Get Token
+token = keycloak_openid.token("user", "password")
+
+# Get Userinfo
+userinfo = keycloak_openid.userinfo(token['access_token'])
+
+# Refresh token
+token = keycloak_openid.refresh_token(token['refresh_token'])
+
+# Logout
+keycloak_openid.logout(token['refresh_token'])
+
+# Get Certs
+certs = keycloak_openid.certs()
+
+# Get RPT (Entitlement)
+token = keycloak_openid.token("user", "password")
+rpt = keycloak_openid.entitlement(token['access_token'], "resource_id")
+
+# Instropect RPT
+token_rpt_info = keycloak_openid.introspect(keycloak_openid.introspect(token['access_token'], rpt=rpt['rpt'],
+                                     token_type_hint="requesting_party_token"))
+
+# Introspect Token
+token_info = keycloak_openid.introspect(token['access_token']))
+
+# Decode Token
+KEYCLOAK_PUBLIC_KEY = "secret"
+options = {"verify_signature": True, "verify_aud": True, "exp": True}
+token_info = keycloak_openid.decode_token(token['access_token'], key=KEYCLOAK_PUBLIC_KEY, options=options)
+
+# Get permissions by token
+token = keycloak_openid.token("user", "password")
+keycloak_openid.load_authorization_config("example-authz-config.json")
+policies = keycloak_openid.get_policies(token['access_token'], method_token_info='decode', key=KEYCLOAK_PUBLIC_KEY)
+permissions = keycloak_openid.get_permissions(token['access_token'], method_token_info='introspect')
+
+# KEYCLOAK ADMIN
+
+from keycloak import KeycloakAdmin
+
+keycloak_admin = KeycloakAdmin(server_url="http://localhost:8080/auth/",
+                               username='example-admin',
+                               password='secret',
+                               realm_name="example_realm",
+                               verify=True)
+        
+# Add user                       
+new_user = keycloak_admin.create_user({"email": "example@example.com",
+                    "username": "example@example.com",
+                    "enabled": True,
+                    "firstName": "Example",
+                    "lastName": "Example",
+                    "realmRoles": ["user_default", ],
+                    "attributes": {"example": "1,2,3,3,"}})  
+                    
+                    
+# Add user and set password
+new_user = keycloak_admin.create_user({"email": "example@example.com",
+                    "username": "example@example.com",
+                    "enabled": True,
+                    "firstName": "Example",
+                    "lastName": "Example",
+                    "credentials": [{"value": "secret","type": "password",}],
+                    "realmRoles": ["user_default", ],
+                    "attributes": {"example": "1,2,3,3,"}})                   
+
+# User counter
+count_users = keycloak_admin.users_count()
+
+# Get users Returns a list of users, filtered according to query parameters
+users = keycloak_admin.get_users({})
+
+# Get user ID from name
+user-id-keycloak = keycloak_admin.get_user_id("example@example.com")
+
+# Get User
+user = keycloak_admin.get_user("user-id-keycloak")
+
+# Update User
+response = keycloak_admin.update_user(user_id="user-id-keycloak", 
+                                      payload={'firstName': 'Example Update'})
+
+# Update User Password
+response = set_user_password(user_id="user-id-keycloak", password="secret", temporary=True)
+                                      
+# Delete User
+response = keycloak_admin.delete_user(user_id="user-id-keycloak")
+
+# Get consents granted by the user
+consents = keycloak_admin.consents_user(user_id="user-id-keycloak")
+
+# Send User Action
+response = keycloak_admin.send_update_account(user_id="user-id-keycloak", 
+                                              payload=json.dumps(['UPDATE_PASSWORD']))
+
+# Send Verify Email
+response = keycloak_admin.send_verify_email(user_id="user-id-keycloak")
+
+# Get sessions associated with the user
+sessions = keycloak_admin.get_sessions(user_id="user-id-keycloak")
+
+# Get themes, social providers, auth providers, and event listeners available on this server
+server_info = keycloak_admin.get_server_info()
+
+# Get clients belonging to the realm Returns a list of clients belonging to the realm
+clients = keycloak_admin.get_clients()
+
+# Get client - id (not client-id) from client by name
+client_id=keycloak_admin.get_client_id("my-client")
+
+# Get representation of the client - id of client (not client-id)
+client = keycloak_admin.get_client(client_id="client_id")
+
+# Get all roles for the realm or client
+realm_roles = keycloak_admin.get_realm_roles()
+
+# Get all roles for the client
+client_roles = keycloak_admin.get_client_roles(client_id="client_id")
+
+# Get client role
+role = keycloak_admin.get_client_role(client_id="client_id", role_name="role_name")
+
+# Warning: Deprecated
+# Get client role id from name
+role_id = keycloak_admin.get_client_role_id(client_id="client_id", role_name="test")
+
+# Create client role
+keycloak_admin.create_client_role(client_id, "test")
+
+# Assign client role to user. Note that BOTH role_name and role_id appear to be required.
+keycloak_admin.assign_client_role(client_id="client_id", user_id="user_id", role_id="role_id", role_name="test")
+
+# Create new group
+group = keycloak_admin.create_group(name="Example Group")
+
+# Get all groups
+groups = keycloak_admin.get_groups()
+
+# Get group 
+group = keycloak_admin.get_group(group_id='group_id')
+
+# Get group by name
+group = keycloak_admin.get_group_by_name(name_or_path='group_id', search_in_subgroups=True)
+
+# Function to trigger user sync from provider
+sync_users(storage_id="storage_di", action="action")
+```
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak-realm.json b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak-realm.json
new file mode 100644
index 000000000..72416d4de
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak-realm.json
@@ -0,0 +1,1999 @@
+{
+  "id": "sunbird",
+  "realm": "sunbird",
+  "notBefore": 0,
+  "revokeRefreshToken": false,
+  "accessTokenLifespan": 21600,
+  "accessTokenLifespanForImplicitFlow": 7200,
+  "ssoSessionIdleTimeout": 1800,
+  "ssoSessionMaxLifespan": 21600,
+  "offlineSessionIdleTimeout": 43200,
+  "accessCodeLifespan": 60,
+  "accessCodeLifespanUserAction": 300,
+  "accessCodeLifespanLogin": 1800,
+  "actionTokenGeneratedByAdminLifespan": 43200,
+  "actionTokenGeneratedByUserLifespan": 300,
+  "enabled": true,
+  "sslRequired": "external",
+  "registrationAllowed": false,
+  "registrationEmailAsUsername": false,
+  "rememberMe": true,
+  "verifyEmail": false,
+  "loginWithEmailAllowed": true,
+  "duplicateEmailsAllowed": false,
+  "resetPasswordAllowed": true,
+  "editUsernameAllowed": false,
+  "bruteForceProtected": false,
+  "permanentLockout": false,
+  "maxFailureWaitSeconds": 900,
+  "minimumQuickLoginWaitSeconds": 60,
+  "waitIncrementSeconds": 60,
+  "quickLoginCheckMilliSeconds": 1000,
+  "maxDeltaTimeSeconds": 43200,
+  "failureFactor": 30,
+  "roles": {
+    "realm": [
+      {
+        "id": "7b955d7f-0a1e-4935-8391-642886d34612",
+        "name": "offline_access",
+        "description": "${role_offline-access}",
+        "scopeParamRequired": true,
+        "composite": false,
+        "clientRole": false,
+        "containerId": "sunbird"
+      },
+      {
+        "id": "96adf368-c8e2-4b39-b2a5-2559573edb63",
+        "name": "uma_authorization",
+        "description": "${role_uma_authorization}",
+        "scopeParamRequired": false,
+        "composite": false,
+        "clientRole": false,
+        "containerId": "sunbird"
+      }
+    ],
+    "client": {
+      "realm-management": [
+        {
+          "id": "3f8bf7e5-5d66-4394-8f06-1270529c605f",
+          "name": "manage-authorization",
+          "description": "${role_manage-authorization}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "601fa2c9-29d4-49c1-87ac-939a1260f6ce",
+          "name": "query-realms",
+          "description": "${role_query-realms}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "9aa1dcd9-cb93-4496-af5f-41b9ecacc1da",
+          "name": "view-authorization",
+          "description": "${role_view-authorization}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "98999987-faf5-4c4e-958a-e5463bc4edc6",
+          "name": "manage-events",
+          "description": "${role_manage-events}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "f898fca8-5361-49d5-900a-ebf5b775a939",
+          "name": "impersonation",
+          "description": "${role_impersonation}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "698dfeb0-b8d2-4240-b8a8-acd4b7a12ad3",
+          "name": "view-realm",
+          "description": "${role_view-realm}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "3ff462fc-b33c-431a-b54b-861c3298d910",
+          "name": "manage-users",
+          "description": "${role_manage-users}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "be1802b1-558c-404c-bcb9-b9bf77af9788",
+          "name": "manage-identity-providers",
+          "description": "${role_manage-identity-providers}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "387b44e4-e901-4431-b9af-6abd9377ed46",
+          "name": "query-clients",
+          "description": "${role_query-clients}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "a408b6e8-03c9-46a2-97ba-305d09db0c3c",
+          "name": "view-events",
+          "description": "${role_view-events}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "41c2f39a-3008-4f9d-9e1e-a7738c118570",
+          "name": "query-groups",
+          "description": "${role_query-groups}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "26d3289b-d2eb-4cf2-a501-f1e3fa07344c",
+          "name": "manage-clients",
+          "description": "${role_manage-clients}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "e2077ab0-6efb-450d-9cba-89cacd887b71",
+          "name": "create-client",
+          "description": "${role_create-client}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "46019462-3dc8-46a8-9786-ffcbad293f43",
+          "name": "view-users",
+          "description": "${role_view-users}",
+          "scopeParamRequired": false,
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "query-groups",
+                "query-users"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "d269f220-e93f-4b43-96a1-9f2c117a2dfb",
+          "name": "view-clients",
+          "description": "${role_view-clients}",
+          "scopeParamRequired": false,
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "query-clients"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "0c998f1b-7363-47fb-a493-4b6f4aacb0ba",
+          "name": "realm-admin",
+          "description": "${role_realm-admin}",
+          "scopeParamRequired": false,
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "manage-authorization",
+                "query-realms",
+                "view-authorization",
+                "manage-events",
+                "impersonation",
+                "view-realm",
+                "manage-users",
+                "manage-identity-providers",
+                "query-clients",
+                "view-events",
+                "query-groups",
+                "manage-clients",
+                "create-client",
+                "view-users",
+                "view-clients",
+                "manage-realm",
+                "view-identity-providers",
+                "query-users"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "d77bf5a5-5877-450b-b11e-5f874f410e10",
+          "name": "manage-realm",
+          "description": "${role_manage-realm}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "d97009ed-d0c7-4afb-b9a3-6ee03ef01a74",
+          "name": "view-identity-providers",
+          "description": "${role_view-identity-providers}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "57118202-c5e5-4c49-829b-c2ed796bfdea",
+          "name": "query-users",
+          "description": "${role_query-users}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        }
+      ],
+      "security-admin-console": [],
+      "android": [],
+      "admin-cli": [],
+      "trampoline": [],
+      "broker": [
+        {
+          "id": "19ef58ac-2d90-40a4-a158-0e2f8893264a",
+          "name": "read-token",
+          "description": "${role_read-token}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "c3950efa-6684-44c2-b50a-c7b3d16df04b"
+        }
+      ],
+      "portal": [],
+      "account": [
+        {
+          "id": "1fef7ac5-b042-462b-8298-0446044788b3",
+          "name": "manage-account",
+          "description": "${role_manage-account}",
+          "scopeParamRequired": false,
+          "composite": true,
+          "composites": {
+            "client": {
+              "account": [
+                "manage-account-links"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "c2d24d3f-65ca-46de-9cd8-3eeb71a7f83d"
+        },
+        {
+          "id": "f8786348-6fa4-4b13-828e-9f080c9c6824",
+          "name": "manage-account-links",
+          "description": "${role_manage-account-links}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "c2d24d3f-65ca-46de-9cd8-3eeb71a7f83d"
+        },
+        {
+          "id": "91c5c738-9c39-4c4d-bae8-75f18fd7c5e4",
+          "name": "view-profile",
+          "description": "${role_view-profile}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "c2d24d3f-65ca-46de-9cd8-3eeb71a7f83d"
+        }
+      ]
+    }
+  },
+  "groups": [],
+  "defaultRoles": [
+    "offline_access",
+    "uma_authorization"
+  ],
+  "requiredCredentials": [
+    "password"
+  ],
+  "passwordPolicy": "hashIterations(20000)",
+  "otpPolicyType": "totp",
+  "otpPolicyAlgorithm": "HmacSHA1",
+  "otpPolicyInitialCounter": 0,
+  "otpPolicyDigits": 6,
+  "otpPolicyLookAheadWindow": 1,
+  "otpPolicyPeriod": 30,
+  "clientScopeMappings": {
+    "realm-management": [
+      {
+        "client": "admin-cli",
+        "roles": [
+          "realm-admin"
+        ]
+      },
+      {
+        "client": "security-admin-console",
+        "roles": [
+          "realm-admin"
+        ]
+      }
+    ]
+  },
+  "clients": [
+    {
+      "id": "9a901d18-377b-4615-9b89-677b544be3c5",
+      "clientId": "trampoline",
+      "rootUrl": "",
+      "adminUrl": "",
+      "baseUrl": "/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [
+      ],
+      "webOrigins": [
+      ],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": false,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "saml.authnstatement": "false",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "protocolMappers": [
+        {
+          "id": "12134027-94cc-401c-bbf6-be565078ddfb",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "6a956bf1-6c40-4549-b335-9fe8c788b18f",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "d32ba1d4-3fef-42ff-aa2b-98cb4bfef6f9",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "9e899fc7-1ddd-447d-810c-d91333d6621c",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "74e4d13f-bd02-4f17-bbbc-d4b79bab1971",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "48fe23c2-a6fb-4c5e-8930-28ad1913829a",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "da893beb-6ac7-420d-b51b-f05dadf56bbc",
+      "clientId": "android",
+      "rootUrl": "",
+      "baseUrl": "/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "saml.authnstatement": "false",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "protocolMappers": [
+        {
+          "id": "ff7dac46-16b4-4ab6-a054-dd03d5411fa9",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "32fad9c0-0dfe-45b2-94a1-3e2f74d756ec",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "4fb4d644-c609-4a27-a407-d451bcd83e16",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "84e7c6e5-1afb-44d8-b507-1ed31fa0f351",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "e7ca189f-94de-4996-a192-e93ba960bbba",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "16bedb3b-7571-4106-9a47-66151915ac31",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "8891d8e9-35e6-4a1c-b32b-027be03b0f24",
+      "clientId": "admin-cli",
+      "name": "${client_admin-cli}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": false,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "32d6a3a4-8635-4a36-bd14-8ac5b73a49cc",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "900fa741-d1b2-467e-88a6-b454a9519568",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "8ea14714-d160-49b8-b612-59102d50ef53",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "bd167b99-5d23-49c1-90c7-85c2b088fed7",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "c4fe56a1-8d15-455a-b87b-cf051454b57c",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "26e3bf4c-8f9a-4548-b0db-5bbb7c398991",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "c3950efa-6684-44c2-b50a-c7b3d16df04b",
+      "clientId": "broker",
+      "name": "${client_broker}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "54c3bbc3-850b-4636-82d1-ed4f3a46a00a",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "0f0d9b74-c476-4981-a783-dd4bdbe041ec",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "d6f625cc-eac1-49d0-bea5-17e6f9d3860c",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "bbf35056-9bbe-49a0-aefc-2bde2379ccdc",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "38b04951-1043-4dc6-9504-7b0f31ed71a4",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "88bb836b-7feb-45eb-b004-fb3be8436908",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "b2f45201-1362-4b10-83c3-207d470f44bf",
+      "clientId": "realm-management",
+      "name": "${client_realm-management}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": true,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "71605238-bf41-400e-8c03-a5d78f54b00b",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "a0cb6f3a-30ef-4475-b73f-ca6c2f1f3675",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "3a7708b1-63b9-4116-af7f-969fc1bf61a4",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "c393d7b7-fa22-4e90-9ad7-07d520632c20",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "2d8cbac4-e4dd-4fa6-bf71-98adf826b9dd",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "e77aae69-8ea4-4ee4-bcd6-ba7ef3958c02",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "8c12290d-d62f-48ce-913b-c93bf995ca59",
+      "clientId": "portal",
+      "rootUrl": "",
+      "adminUrl": "/callback",
+      "baseUrl": "/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [
+      ],
+      "webOrigins": [
+        ""
+      ],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "saml.authnstatement": "false",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "protocolMappers": [
+        {
+          "id": "63071ff2-a5e5-4d38-b534-a9f25a075403",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "9bf9cad5-dbce-41e9-aa36-d84cc5a768a2",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "238e55b7-6545-467e-856b-f95477afe1ff",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "edb1ff4e-b452-46bc-8c3b-d6075f6ee579",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "7a0118e2-57ff-4d23-bf74-cbfe1f545d1d",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "b59a913e-118a-4dc4-a8d7-66c44ced5345",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "79c518d7-b41a-4e6f-be42-4ef365824100",
+      "clientId": "security-admin-console",
+      "name": "${client_security-admin-console}",
+      "baseUrl": "/auth/admin/sunbird/console/index.html",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [
+        "/auth/admin/sunbird/console/*"
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "c989a8c8-cb8b-40ff-b4b9-86122bad7aa9",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "b180fb8c-997c-4f6a-b774-af677f903139",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "c373dc9a-49d7-4d28-9b94-06cf20fb1955",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "24c7b1c4-62c2-4d92-ab19-49bfaedcc3d4",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "883a39a7-37b4-46ef-a761-3e51b95ccc35",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "95ed8e44-38cc-4f09-8adc-19c12d5eada0",
+          "name": "locale",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "consentText": "${locale}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "locale",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "locale",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "c66c6a41-eb22-443f-8a77-e68d404ad26f",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "c2d24d3f-65ca-46de-9cd8-3eeb71a7f83d",
+      "clientId": "account",
+      "name": "${client_account}",
+      "baseUrl": "/auth/realms/sunbird/account",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "defaultRoles": [
+        "manage-account",
+        "view-profile"
+      ],
+      "redirectUris": [
+        "/auth/realms/sunbird/account/*"
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "a64118ab-33c8-4060-9f3e-3ed817ba8e0d",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "1f4a0c5e-7c8a-4693-8be5-14681b243868",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "8d88a133-a399-4e75-b051-5b0d4ae850ab",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "45593258-916c-4158-8577-d9806c16415a",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "027be48e-b7dc-4c3a-a648-414a466b67dd",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "c93937f9-0446-4be9-8b47-3c6de857497e",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    }
+  ],
+  "clientTemplates": [],
+  "browserSecurityHeaders": {
+    "xContentTypeOptions": "nosniff",
+    "xRobotsTag": "none",
+    "xFrameOptions": "SAMEORIGIN",
+    "xXSSProtection": "1; mode=block",
+    "contentSecurityPolicy": "frame-src 'self'"
+  },
+  "smtpServer": {
+    "password": "",
+    "starttls": "",
+    "auth": "true",
+    "port": "587",
+    "host": "",
+    "from": "",
+    "ssl": "",
+    "user": ""
+  },
+  "loginTheme": "sunrise",
+  "eventsEnabled": false,
+  "eventsListeners": [
+    "jboss-logging"
+  ],
+  "enabledEventTypes": [],
+  "adminEventsEnabled": false,
+  "adminEventsDetailsEnabled": false,
+  "components": {
+    "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy": [
+      {
+        "id": "84078bbb-e005-44c8-9c7d-a1b4821558da",
+        "name": "Max Clients Limit",
+        "providerId": "max-clients",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "max-clients": [
+            "200"
+          ]
+        }
+      },
+      {
+        "id": "346d857e-4385-4f8f-a2fc-072fd11a10ec",
+        "name": "Allowed Protocol Mapper Types",
+        "providerId": "allowed-protocol-mappers",
+        "subType": "authenticated",
+        "subComponents": {},
+        "config": {
+          "allowed-protocol-mapper-types": [
+            "saml-user-attribute-mapper",
+            "oidc-usermodel-attribute-mapper",
+            "oidc-usermodel-property-mapper",
+            "saml-role-list-mapper",
+            "saml-user-property-mapper",
+            "oidc-full-name-mapper",
+            "oidc-address-mapper",
+            "oidc-sha256-pairwise-sub-mapper"
+          ],
+          "consent-required-for-all-mappers": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "eed64f9f-4b66-45ad-bdb4-4070e3802366",
+        "name": "Allowed Client Templates",
+        "providerId": "allowed-client-templates",
+        "subType": "authenticated",
+        "subComponents": {},
+        "config": {}
+      },
+      {
+        "id": "17ac4eaa-9139-4b3a-b1db-c82d44c1531d",
+        "name": "Allowed Client Templates",
+        "providerId": "allowed-client-templates",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      },
+      {
+        "id": "38532936-be91-40e4-b65d-c0abfaf9547c",
+        "name": "Full Scope Disabled",
+        "providerId": "scope",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      },
+      {
+        "id": "8c1690a2-6eea-4d61-ab66-7a015e3bea3c",
+        "name": "Allowed Protocol Mapper Types",
+        "providerId": "allowed-protocol-mappers",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "allowed-protocol-mapper-types": [
+            "oidc-usermodel-property-mapper",
+            "saml-user-property-mapper",
+            "oidc-full-name-mapper",
+            "oidc-sha256-pairwise-sub-mapper",
+            "oidc-address-mapper",
+            "oidc-usermodel-attribute-mapper",
+            "saml-role-list-mapper",
+            "saml-user-attribute-mapper"
+          ],
+          "consent-required-for-all-mappers": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "3dcc314c-07f8-484d-9535-29424dbaddfc",
+        "name": "Trusted Hosts",
+        "providerId": "trusted-hosts",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "host-sending-registration-request-must-match": [
+            "true"
+          ],
+          "client-uris-must-match": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "ab52b781-64b9-42a0-99f5-cbeba6710763",
+        "name": "Consent Required",
+        "providerId": "consent-required",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      }
+    ],
+    "org.keycloak.keys.KeyProvider": [
+      {
+        "id": "bd30c46f-9ee3-443d-9faa-6ed8075aac87",
+        "name": "rsa-generated",
+        "providerId": "rsa-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ]
+        }
+      },
+      {
+        "id": "a93cc73f-b070-48cd-bf08-9b290707c2f5",
+        "name": "hmac-generated",
+        "providerId": "hmac-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ]
+        }
+      }
+    ]
+  },
+  "internationalizationEnabled": true,
+  "supportedLocales": [
+    "de",
+    "no",
+    "ru",
+    "sv",
+    "pt-BR",
+    "ja",
+    "lt",
+    "en",
+    "it",
+    "fr",
+    "es",
+    "ca"
+  ],
+  "defaultLocale": "en",
+  "authenticationFlows": [
+    {
+      "id": "6c9d3423-9956-4d08-a124-41cd17aceb5a",
+      "alias": "Direct Grant 2",
+      "description": "OpenID Connect Resource Owner Grant",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": false,
+      "authenticationExecutions": [
+        {
+          "authenticator": "direct-grant-validate-username",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "direct-grant-validate-password",
+          "requirement": "DISABLED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "direct-grant-validate-otp",
+          "requirement": "OPTIONAL",
+          "priority": 30,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "a7a49eb1-4386-499a-8a8f-13454b428f98",
+      "alias": "Direct Grant w/o Password",
+      "description": "Grant user access using only the username and no password.",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": false,
+      "authenticationExecutions": []
+    },
+    {
+      "id": "c7b2f9c2-525b-486a-b2a8-148606caac0e",
+      "alias": "Handle Existing Account",
+      "description": "Handle what to do if there is existing account with same email/username like authenticated identity provider",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-confirm-link",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "idp-email-verification",
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "flowAlias": "Verify Existing Account by Re-authentication",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "c4674fef-8631-43c5-8f44-deb8867fa866",
+      "alias": "Verify Existing Account by Re-authentication",
+      "description": "Reauthentication of existing account",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-username-password-form",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "requirement": "OPTIONAL",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "35016b3a-a041-47fd-8a85-a131c6f7b745",
+      "alias": "browser",
+      "description": "browser based authentication",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-cookie",
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-spnego",
+          "requirement": "DISABLED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "identity-provider-redirector",
+          "requirement": "ALTERNATIVE",
+          "priority": 25,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "flowAlias": "forms",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "8e85927e-349d-4a0a-a7da-efb352ba78ce",
+      "alias": "clients",
+      "description": "Base authentication for clients",
+      "providerId": "client-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "client-secret",
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "client-jwt",
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "b62ac783-8af6-429e-a8ff-7c8073195675",
+      "alias": "direct grant",
+      "description": "OpenID Connect Resource Owner Grant",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "direct-grant-validate-username",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "direct-grant-validate-password",
+          "requirement": "DISABLED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "direct-grant-validate-otp",
+          "requirement": "OPTIONAL",
+          "priority": 30,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "e16e69c8-a3e8-480c-8201-8474d614e172",
+      "alias": "docker auth",
+      "description": "Used by Docker clients to authenticate against the IDP",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "docker-http-basic-authenticator",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "487ab3f9-33bf-49e2-8b03-5c45c85ea8b5",
+      "alias": "first broker login",
+      "description": "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticatorConfig": "review profile config",
+          "authenticator": "idp-review-profile",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorConfig": "create unique user config",
+          "authenticator": "idp-create-user-if-unique",
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "flowAlias": "Handle Existing Account",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "a6d19ee2-387a-4db8-9ecb-2e9f806a88a1",
+      "alias": "forms",
+      "description": "Username, password, otp and other auth forms.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-username-password-form",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "requirement": "OPTIONAL",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "43fc7877-ad15-4c93-b327-15d4ca83f3e1",
+      "alias": "registration",
+      "description": "registration flow",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "registration-page-form",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "flowAlias": "registration form",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "8a77377f-60eb-4a23-8bfe-b7c360d7b48f",
+      "alias": "registration form",
+      "description": "registration form",
+      "providerId": "form-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "registration-user-creation",
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "registration-profile-action",
+          "requirement": "REQUIRED",
+          "priority": 40,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "registration-password-action",
+          "requirement": "REQUIRED",
+          "priority": 50,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "registration-recaptcha-action",
+          "requirement": "DISABLED",
+          "priority": 60,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "30bd3dd1-f2f1-4708-a07d-08cf759c7b28",
+      "alias": "reset credentials",
+      "description": "Reset credentials for a user if they forgot their password or something",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "reset-credentials-choose-user",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-credential-email",
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-password",
+          "requirement": "REQUIRED",
+          "priority": 30,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-otp",
+          "requirement": "OPTIONAL",
+          "priority": 40,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "226a50b1-059a-44ef-8cfe-082dee5d60b9",
+      "alias": "saml ecp",
+      "description": "SAML ECP Profile Authentication Flow",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "http-basic-authenticator",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    }
+  ],
+  "authenticatorConfig": [
+    {
+      "id": "aec72381-3c1d-4a96-b436-ddb72b3737b9",
+      "alias": "create unique user config",
+      "config": {
+        "require.password.update.after.registration": "false"
+      }
+    },
+    {
+      "id": "51f3fa48-bf74-4df9-9724-c0a9d6fe7c80",
+      "alias": "review profile config",
+      "config": {
+        "update.profile.on.first.login": "missing"
+      }
+    }
+  ],
+  "requiredActions": [
+    {
+      "alias": "CONFIGURE_TOTP",
+      "name": "Configure OTP",
+      "providerId": "CONFIGURE_TOTP",
+      "enabled": true,
+      "defaultAction": false,
+      "config": {}
+    },
+    {
+      "alias": "UPDATE_PASSWORD",
+      "name": "Update Password",
+      "providerId": "UPDATE_PASSWORD",
+      "enabled": true,
+      "defaultAction": false,
+      "config": {}
+    },
+    {
+      "alias": "UPDATE_PROFILE",
+      "name": "Update Profile",
+      "providerId": "UPDATE_PROFILE",
+      "enabled": true,
+      "defaultAction": false,
+      "config": {}
+    },
+    {
+      "alias": "VERIFY_EMAIL",
+      "name": "Verify Email",
+      "providerId": "VERIFY_EMAIL",
+      "enabled": true,
+      "defaultAction": false,
+      "config": {}
+    },
+    {
+      "alias": "terms_and_conditions",
+      "name": "Terms and Conditions",
+      "providerId": "terms_and_conditions",
+      "enabled": true,
+      "defaultAction": false,
+      "config": {}
+    }
+  ],
+  "browserFlow": "browser",
+  "registrationFlow": "registration",
+  "directGrantFlow": "Direct Grant 2",
+  "resetCredentialsFlow": "reset credentials",
+  "clientAuthenticationFlow": "clients",
+  "dockerAuthenticationFlow": "docker auth",
+  "attributes": {
+    "_browser_header.xXSSProtection": "1; mode=block",
+    "_browser_header.xFrameOptions": "SAMEORIGIN",
+    "permanentLockout": "false",
+    "quickLoginCheckMilliSeconds": "1000",
+    "_browser_header.xRobotsTag": "none",
+    "maxFailureWaitSeconds": "900",
+    "minimumQuickLoginWaitSeconds": "60",
+    "failureFactor": "30",
+    "actionTokenGeneratedByUserLifespan": "300",
+    "maxDeltaTimeSeconds": "43200",
+    "_browser_header.xContentTypeOptions": "nosniff",
+    "actionTokenGeneratedByAdminLifespan": "43200",
+    "bruteForceProtected": "false",
+    "_browser_header.contentSecurityPolicy": "frame-src 'self'",
+    "waitIncrementSeconds": "60"
+  },
+  "keycloakVersion": "3.2.0.Final"
+}
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/__init__.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/__init__.py
new file mode 100644
index 000000000..cf1f95540
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/__init__.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from .keycloak_openid import *
+from .keycloak_admin import *
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/__init__.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/__init__.py
new file mode 100644
index 000000000..4a1d86dbe
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/__init__.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import ast
+import json
+
+from .permission import Permission
+from .policy import Policy
+from .role import Role
+
+
+class Authorization:
+    """
+    Keycloak Authorization (policies, roles, scopes and resources).
+
+    https://keycloak.gitbooks.io/documentation/authorization_services/index.html
+
+    """
+
+    def __init__(self):
+        self._policies = {}
+
+    @property
+    def policies(self):
+        return self._policies
+
+    @policies.setter
+    def policies(self, value):
+        self._policies = value
+
+    def load_config(self, data):
+        """
+        Load policies, roles and permissions (scope/resources).
+
+        :param data: keycloak authorization data (dict)
+        :return:
+        """
+        for pol in data['policies']:
+            if pol['type'] == 'role':
+                policy = Policy(name=pol['name'],
+                                type=pol['type'],
+                                logic=pol['logic'],
+                                decision_strategy=pol['decisionStrategy'])
+
+                config_roles = json.loads(pol['config']['roles'])
+                for role in config_roles:
+                    policy.add_role(Role(name=role['id'],
+                                         required=role['required']))
+
+                self.policies[policy.name] = policy
+
+            if pol['type'] == 'scope':
+                permission = Permission(name=pol['name'],
+                                        type=pol['type'],
+                                        logic=pol['logic'],
+                                        decision_strategy=pol['decisionStrategy'])
+
+                permission.scopes = ast.literal_eval(pol['config']['scopes'])
+
+                for policy_name in ast.literal_eval(pol['config']['applyPolicies']):
+                    self.policies[policy_name].add_permission(permission)
+
+            if pol['type'] == 'resource':
+                permission = Permission(name=pol['name'],
+                                        type=pol['type'],
+                                        logic=pol['logic'],
+                                        decision_strategy=pol['decisionStrategy'])
+
+                permission.resources = ast.literal_eval(pol['config']['resources'])
+
+                for policy_name in ast.literal_eval(pol['config']['applyPolicies']):
+                    self.policies[policy_name].add_permission(permission)
+
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/permission.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/permission.py
new file mode 100644
index 000000000..94eca7795
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/permission.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+class Permission:
+    """
+    Consider this simple and very common permission:
+
+    A permission associates the object being protected with the policies that must be evaluated to determine whether access is granted.
+
+    X CAN DO Y ON RESOURCE Z
+
+    where …
+        X represents one or more users, roles, or groups, or a combination of them. You can
+        also use claims and context here.
+        Y represents an action to be performed, for example, write, view, and so on.
+        Z represents a protected resource, for example, "/accounts".
+
+    https://keycloak.gitbooks.io/documentation/authorization_services/topics/permission/overview.html
+
+    """
+
+    def __init__(self, name, type, logic, decision_strategy):
+        self._name = name
+        self._type = type
+        self._logic = logic
+        self._decision_strategy = decision_strategy
+        self._resources = []
+        self._scopes = []
+
+    def __repr__(self):
+        return "<Permission: %s (%s)>" % (self.name, self.type)
+
+    def __str__(self):
+        return "Permission: %s (%s)" % (self.name, self.type)
+
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, value):
+        self._name = value
+
+    @property
+    def type(self):
+        return self._type
+
+    @type.setter
+    def type(self, value):
+        self._type = value
+
+    @property
+    def logic(self):
+        return self._logic
+
+    @logic.setter
+    def logic(self, value):
+        self._logic = value
+
+    @property
+    def decision_strategy(self):
+        return self._decision_strategy
+
+    @decision_strategy.setter
+    def decision_strategy(self, value):
+        self._decision_strategy = value
+
+    @property
+    def resources(self):
+        return self._resources
+
+    @resources.setter
+    def resources(self, value):
+        self._resources = value
+
+    @property
+    def scopes(self):
+        return self._scopes
+
+    @scopes.setter
+    def scopes(self, value):
+        self._scopes = value
+
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/policy.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/policy.py
new file mode 100644
index 000000000..66512bac3
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/policy.py
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from ..exceptions import KeycloakAuthorizationConfigError
+
+
+class Policy:
+    """
+    A policy defines the conditions that must be satisfied to grant access to an object.
+    Unlike permissions, you do not specify the object being protected but rather the conditions
+    that must be satisfied for access to a given object (for example, resource, scope, or both).
+    Policies are strongly related to the different access control mechanisms (ACMs) that you can use to
+    protect your resources. With policies, you can implement strategies for attribute-based access control
+    (ABAC), role-based access control (RBAC), context-based access control, or any combination of these.
+
+    https://keycloak.gitbooks.io/documentation/authorization_services/topics/policy/overview.html
+
+    """
+
+    def __init__(self, name, type, logic, decision_strategy):
+        self._name = name
+        self._type = type
+        self._logic = logic
+        self._decision_strategy = decision_strategy
+        self._roles = []
+        self._permissions = []
+
+    def __repr__(self):
+        return "<Policy: %s (%s)>" % (self.name, self.type)
+
+    def __str__(self):
+        return "Policy: %s (%s)" % (self.name, self.type)
+
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, value):
+        self._name = value
+
+    @property
+    def type(self):
+        return self._type
+
+    @type.setter
+    def type(self, value):
+        self._type = value
+
+    @property
+    def logic(self):
+        return self._logic
+
+    @logic.setter
+    def logic(self, value):
+        self._logic = value
+
+    @property
+    def decision_strategy(self):
+        return self._decision_strategy
+
+    @decision_strategy.setter
+    def decision_strategy(self, value):
+        self._decision_strategy = value
+
+    @property
+    def roles(self):
+        return self._roles
+
+    @property
+    def permissions(self):
+        return self._permissions
+
+    def add_role(self, role):
+        """
+        Add keycloak role in policy.
+
+        :param role: keycloak role.
+        :return:
+        """
+        if self.type != 'role':
+            raise KeycloakAuthorizationConfigError(
+                "Can't add role. Policy type is different of role")
+        self._roles.append(role)
+
+    def add_permission(self, permission):
+        """
+        Add keycloak permission in policy.
+
+        :param permission: keycloak permission.
+        :return:
+        """
+        self._permissions.append(permission)
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/role.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/role.py
new file mode 100644
index 000000000..8d398b09e
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/authorization/role.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+class Role:
+    """
+    Roles identify a type or category of user. Admin, user,
+    manager, and employee are all typical roles that may exist in an organization.
+
+    https://keycloak.gitbooks.io/documentation/server_admin/topics/roles.html
+
+    """
+
+    def __init__(self, name, required=False):
+        self.name = name
+        self.required = required
+
+    @property
+    def get_name(self):
+        return self.name
+
+    def __eq__(self, other):
+        if isinstance(other, str):
+            return self.name == other
+        return NotImplemented
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/connection.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/connection.py
new file mode 100644
index 000000000..503b688a7
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/connection.py
@@ -0,0 +1,199 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+try:
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin
+
+from .exceptions import *
+import requests
+
+
+class ConnectionManager(object):
+    """ Represents a simple server connection.
+    Args:
+        base_url (str): The server URL.
+        headers (dict): The header parameters of the requests to the server.
+        timeout (int): Timeout to use for requests to the server.
+        verify (bool): Verify server SSL.
+    """
+
+    def __init__(self, base_url, headers={}, timeout=60, verify=True):
+        self._base_url = base_url
+        self._headers = headers
+        self._timeout = timeout
+        self._verify = verify
+
+    @property
+    def base_url(self):
+        """ Return base url in use for requests to the server. """
+        return self._base_url
+
+    @base_url.setter
+    def base_url(self, value):
+        """ """
+        self._base_url = value
+
+    @property
+    def timeout(self):
+        """ Return timeout in use for request to the server. """
+        return self._timeout
+
+    @timeout.setter
+    def timeout(self, value):
+        """ """
+        self._timeout = value
+
+    @property
+    def verify(self):
+        """ Return verify in use for request to the server. """
+        return self._verify
+
+    @verify.setter
+    def verify(self, value):
+        """ """
+        self._verify = value
+
+    @property
+    def headers(self):
+        """ Return header request to the server. """
+        return self._headers
+
+    @headers.setter
+    def headers(self, value):
+        """ """
+        self._headers = value
+
+    def param_headers(self, key):
+        """ Return a specific header parameter.
+        :arg
+            key (str): Header parameters key.
+        :return:
+            If the header parameters exist, return its value.
+        """
+        return self.headers.get(key)
+
+    def clean_headers(self):
+        """ Clear header parameters. """
+        self.headers = {}
+
+    def exist_param_headers(self, key):
+        """ Check if the parameter exists in the header.
+        :arg
+            key (str): Header parameters key.
+        :return:
+            If the header parameters exist, return True.
+        """
+        return self.param_headers(key) is not None
+
+    def add_param_headers(self, key, value):
+        """ Add a single parameter inside the header.
+        :arg
+            key (str): Header parameters key.
+            value (str): Value to be added.
+        """
+        self.headers[key] = value
+
+    def del_param_headers(self, key):
+        """ Remove a specific parameter.
+        :arg
+            key (str): Key of the header parameters.
+        """
+        self.headers.pop(key, None)
+
+    def raw_get(self, path, **kwargs):
+        """ Submit get request to the path.
+        :arg
+            path (str): Path for request.
+        :return
+            Response the request.
+        :exception
+            HttpError: Can't connect to server.
+        """
+
+        try:
+            return requests.get(urljoin(self.base_url, path),
+                                params=kwargs,
+                                headers=self.headers,
+                                timeout=self.timeout,
+                                verify=self.verify)
+        except Exception as e:
+            raise KeycloakConnectionError(
+                "Can't connect to server (%s)" % e)
+
+    def raw_post(self, path, data, **kwargs):
+        """ Submit post request to the path.
+        :arg
+            path (str): Path for request.
+            data (dict): Payload for request.
+        :return
+            Response the request.
+        :exception
+            HttpError: Can't connect to server.
+        """
+        try:
+            return requests.post(urljoin(self.base_url, path),
+                                 params=kwargs,
+                                 data=data,
+                                 headers=self.headers,
+                                 timeout=self.timeout,
+                                 verify=self.verify)
+        except Exception as e:
+            raise KeycloakConnectionError(
+                "Can't connect to server (%s)" % e)
+
+    def raw_put(self, path, data, **kwargs):
+        """ Submit put request to the path.
+        :arg
+            path (str): Path for request.
+            data (dict): Payload for request.
+        :return
+            Response the request.
+        :exception
+            HttpError: Can't connect to server.
+        """
+        try:
+            return requests.put(urljoin(self.base_url, path),
+                                params=kwargs,
+                                data=data,
+                                headers=self.headers,
+                                timeout=self.timeout,
+                                verify=self.verify)
+        except Exception as e:
+            raise KeycloakConnectionError(
+                "Can't connect to server (%s)" % e)
+
+    def raw_delete(self, path, **kwargs):
+        """ Submit delete request to the path.
+
+        :arg
+            path (str): Path for request.
+        :return
+            Response the request.
+        :exception
+            HttpError: Can't connect to server.
+        """
+        try:
+            return requests.delete(urljoin(self.base_url, path),
+                                   params=kwargs,
+                                   headers=self.headers,
+                                   timeout=self.timeout,
+                                   verify=self.verify)
+        except Exception as e:
+            raise KeycloakConnectionError(
+                "Can't connect to server (%s)" % e)
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/exceptions.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/exceptions.py
new file mode 100644
index 000000000..27d8b14c1
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/exceptions.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import requests
+
+
+class KeycloakError(Exception):
+    def __init__(self, error_message="", response_code=None,
+                 response_body=None):
+
+        Exception.__init__(self, error_message)
+
+        self.response_code = response_code
+        self.response_body = response_body
+        self.error_message = error_message
+
+    def __str__(self):
+        if self.response_code is not None:
+            return "{0}: {1}".format(self.response_code, self.error_message)
+        else:
+            return "{0}".format(self.error_message)
+
+
+class KeycloakAuthenticationError(KeycloakError):
+    pass
+
+
+class KeycloakConnectionError(KeycloakError):
+    pass
+
+
+class KeycloakOperationError(KeycloakError):
+    pass
+
+
+class KeycloakGetError(KeycloakOperationError):
+    pass
+
+
+class KeycloakSecretNotFound(KeycloakOperationError):
+    pass
+
+
+class KeycloakRPTNotFound(KeycloakOperationError):
+    pass
+
+
+class KeycloakAuthorizationConfigError(KeycloakOperationError):
+    pass
+
+
+class KeycloakInvalidTokenError(KeycloakOperationError):
+    pass
+
+
+def raise_error_from_response(response, error, expected_code=200):
+
+    if expected_code == response.status_code:
+        if expected_code == requests.codes.no_content:
+            return {}
+        try:
+            return response.json()
+        except ValueError:
+            return response.content
+
+    try:
+        message = response.json()['message']
+    except (KeyError, ValueError):
+        message = response.content
+
+    if isinstance(error, dict):
+        error = error.get(response.status_code, KeycloakOperationError)
+    else:
+        if response.status_code == 401:
+            error = KeycloakAuthenticationError
+
+    raise error(error_message=message,
+                response_code=response.status_code,
+                response_body=response.content)
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_admin.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_admin.py
new file mode 100644
index 000000000..79f5c2c6d
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_admin.py
@@ -0,0 +1,670 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Unless otherwise stated in the comments, "id", in e.g. user_id, refers to the
+# internal Keycloak server ID, usually a uuid string
+from keycloak.urls_patterns import URL_ADMIN_CLIENT_ROLE
+from .urls_patterns import \
+    URL_ADMIN_USERS_COUNT, URL_ADMIN_USER, URL_ADMIN_USER_CONSENTS, \
+    URL_ADMIN_SEND_UPDATE_ACCOUNT, URL_ADMIN_RESET_PASSWORD, URL_ADMIN_SEND_VERIFY_EMAIL, URL_ADMIN_GET_SESSIONS, \
+    URL_ADMIN_SERVER_INFO, URL_ADMIN_CLIENTS, URL_ADMIN_CLIENT, URL_ADMIN_CLIENT_ROLES, URL_ADMIN_REALM_ROLES, \
+    URL_ADMIN_GROUP, URL_ADMIN_GROUPS, URL_ADMIN_GROUP_CHILD, URL_ADMIN_USER_GROUP,\
+    URL_ADMIN_GROUP_PERMISSIONS, URL_ADMIN_USER_CLIENT_ROLES, URL_ADMIN_USER_STORAGE, URL_ADMIN_REALM
+
+from .keycloak_openid import KeycloakOpenID
+
+from .exceptions import raise_error_from_response, KeycloakGetError
+
+from .urls_patterns import (
+    URL_ADMIN_USERS,
+)
+
+from .connection import ConnectionManager
+import json
+
+
+class KeycloakAdmin:
+
+    def __init__(self, server_url, username, password, realm_name='master', client_id='admin-cli', verify=True):
+        """
+
+        :param server_url: Keycloak server url
+        :param username: admin username
+        :param password: admin password
+        :param realm_name: realm name
+        :param client_id: client id
+        :param verify: True if want check connection SSL
+        """
+        self._username = username
+        self._password = password
+        self._client_id = client_id
+        self._realm_name = realm_name
+
+        # Get token Admin
+        keycloak_openid = KeycloakOpenID(server_url=server_url, client_id=client_id, realm_name=realm_name,
+                                         verify=verify)
+        self._token = keycloak_openid.token(username, password)
+
+        self._connection = ConnectionManager(base_url=server_url,
+                                             headers={'Authorization': 'Bearer ' + self.token.get('access_token'),
+                                                      'Content-Type': 'application/json'},
+                                             timeout=60,
+                                             verify=verify)
+
+    @property
+    def realm_name(self):
+        return self._realm_name
+
+    @realm_name.setter
+    def realm_name(self, value):
+        self._realm_name = value
+
+    @property
+    def connection(self):
+        return self._connection
+
+    @connection.setter
+    def connection(self, value):
+        self._connection = value
+
+    @property
+    def client_id(self):
+        return self._client_id
+
+    @client_id.setter
+    def client_id(self, value):
+        self._client_id = value
+
+    @property
+    def username(self):
+        return self._username
+
+    @username.setter
+    def username(self, value):
+        self._username = value
+
+    @property
+    def password(self):
+        return self._password
+
+    @password.setter
+    def password(self, value):
+        self._password = value
+
+    @property
+    def token(self):
+        return self._token
+
+    @token.setter
+    def token(self, value):
+        self._token = value
+
+    def get_users(self, query=None):
+        """
+        Get users Returns a list of users, filtered according to query parameters
+
+        :return: users list
+        """
+        params_path = {"realm-name": self.realm_name}
+        data_raw = self.connection.raw_get(URL_ADMIN_USERS.format(**params_path), **query)
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def create_user(self, payload):
+        """
+        Create a new user Username must be unique
+
+        UserRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_userrepresentation
+
+        :param payload: UserRepresentation
+
+        :return: UserRepresentation
+        """
+        params_path = {"realm-name": self.realm_name}
+        data_raw = self.connection.raw_post(URL_ADMIN_USERS.format(**params_path),
+                                            data=json.dumps(payload))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=201)
+
+    def users_count(self):
+        """
+        User counter
+
+        :return: counter
+        """
+        params_path = {"realm-name": self.realm_name}
+        data_raw = self.connection.raw_get(URL_ADMIN_USERS_COUNT.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_user_id(self, username):
+        """
+        Get internal keycloak user id from username
+        This is required for further actions against this user.
+
+        UserRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_userrepresentation
+
+        :param username: id in UserRepresentation
+
+        :return: user_id
+        """
+        params_path = {"realm-name": self.realm_name, "username": username}
+        data_raw = self.connection.raw_get(URL_ADMIN_USERS.format(**params_path))
+        data_content = raise_error_from_response(data_raw, KeycloakGetError)
+
+        for user in data_content:
+            this_use_rname = json.dumps(user["username"]).strip('"')
+            if this_use_rname == username:
+                return json.dumps(user["id"]).strip('"')
+
+        return None
+
+    def get_user(self, user_id):
+        """
+        Get representation of the user
+
+        :param user_id: User id
+
+        UserRepresentation: http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_userrepresentation
+
+        :return: UserRepresentation
+        """
+        params_path = {"realm-name": self.realm_name, "id": user_id}
+        data_raw = self.connection.raw_get(URL_ADMIN_USER.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def update_user(self, user_id, payload):
+        """
+        Update the user
+
+        :param user_id: User id
+        :param payload: UserRepresentation
+
+        :return: Http response
+        """
+        params_path = {"realm-name": self.realm_name, "id": user_id}
+        data_raw = self.connection.raw_put(URL_ADMIN_USER.format(**params_path),
+                                           data=json.dumps(payload))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=204)
+
+    def delete_user(self, user_id):
+        """
+        Delete the user
+
+        :param user_id: User id
+
+        :return: Http response
+        """
+        params_path = {"realm-name": self.realm_name, "id": user_id}
+        data_raw = self.connection.raw_delete(URL_ADMIN_USER.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=204)
+
+    def set_user_password(self, user_id, password, temporary=True):
+        """
+        Set up a password for the user. If temporary is True, the user will have to reset
+        the temporary password next time they log in.
+
+        http://www.keycloak.org/docs-api/3.2/rest-api/#_users_resource
+        http://www.keycloak.org/docs-api/3.2/rest-api/#_credentialrepresentation
+
+        :param user_id: User id
+        :param password: New password
+        :param temporary: True if password is temporary
+
+        :return:
+        """
+        payload = {"type": "password", "temporary": temporary, "value": password}
+        params_path = {"realm-name": self.realm_name, "id": user_id}
+        data_raw = self.connection.raw_put(URL_ADMIN_RESET_PASSWORD.format(**params_path),
+                                           data=json.dumps(payload))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=204)
+
+    def consents_user(self, user_id):
+        """
+        Get consents granted by the user
+
+        :param user_id: User id
+
+        :return: consents
+        """
+        params_path = {"realm-name": self.realm_name, "id": user_id}
+        data_raw = self.connection.raw_get(URL_ADMIN_USER_CONSENTS.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def send_update_account(self, user_id, payload, client_id=None, lifespan=None, redirect_uri=None):
+        """
+        Send a update account email to the user An email contains a
+        link the user can click to perform a set of required actions.
+
+        :param user_id:
+        :param payload:
+        :param client_id:
+        :param lifespan:
+        :param redirect_uri:
+
+        :return:
+        """
+        params_path = {"realm-name": self.realm_name, "id": user_id}
+        params_query = {"client_id": client_id, "lifespan": lifespan, "redirect_uri": redirect_uri}
+        data_raw = self.connection.raw_put(URL_ADMIN_SEND_UPDATE_ACCOUNT.format(**params_path),
+                                           data=payload, **params_query)
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def send_verify_email(self, user_id, client_id=None, redirect_uri=None):
+        """
+        Send a update account email to the user An email contains a
+        link the user can click to perform a set of required actions.
+
+        :param user_id: User id
+        :param client_id: Client id
+        :param redirect_uri: Redirect uri
+
+        :return:
+        """
+        params_path = {"realm-name": self.realm_name, "id": user_id}
+        params_query = {"client_id": client_id, "redirect_uri": redirect_uri}
+        data_raw = self.connection.raw_put(URL_ADMIN_SEND_VERIFY_EMAIL.format(**params_path),
+                                           data={}, **params_query)
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_sessions(self, user_id):
+        """
+        Get sessions associated with the user
+
+        :param user_id:  id of user
+
+        UserSessionRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_usersessionrepresentation
+
+        :return: UserSessionRepresentation
+        """
+        params_path = {"realm-name": self.realm_name, "id": user_id}
+        data_raw = self.connection.raw_get(URL_ADMIN_GET_SESSIONS.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_server_info(self):
+        """
+        Get themes, social providers, auth providers, and event listeners available on this server
+
+        ServerInfoRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_serverinforepresentation
+
+        :return: ServerInfoRepresentation
+        """
+        data_raw = self.connection.raw_get(URL_ADMIN_SERVER_INFO)
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_groups(self):
+        """
+        Get groups belonging to the realm. Returns a list of groups belonging to the realm
+
+        GroupRepresentation
+        http://www.keycloak.org/docs-api/3.2/rest-api/#_grouprepresentation
+
+        :return: array GroupRepresentation
+        """
+        params_path = {"realm-name": self.realm_name}
+        data_raw = self.connection.raw_get(URL_ADMIN_GROUPS.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_group(self, group_id):
+        """
+        Get group by id. Returns full group details
+
+        GroupRepresentation
+        http://www.keycloak.org/docs-api/3.2/rest-api/#_grouprepresentation
+
+        :return: Keycloak server response (GroupRepresentation)
+        """
+        params_path = {"realm-name": self.realm_name, "id": group_id}
+        data_raw = self.connection.raw_get(URL_ADMIN_GROUP.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_group_by_name(self, name_or_path, search_in_subgroups=False):
+        """
+        Get group id based on name or path.
+        A straight name or path match with a top-level group will return first.
+        Subgroups are traversed, the first to match path (or name with path) is returned.
+
+        GroupRepresentation
+        http://www.keycloak.org/docs-api/3.2/rest-api/#_grouprepresentation
+
+        :param name: group name
+        :param path: group path
+        :param search_in_subgroups: True if want search in the subgroups
+        :return: Keycloak server response (GroupRepresentation)
+        """
+
+        groups = self.get_groups()
+
+        # TODO: Review this code is necessary
+        for group in groups:
+            if group['name'] == name_or_path or group['path'] == name_or_path:
+                return group
+            elif search_in_subgroups and group["subGroups"]:
+                for subgroup in group["subGroups"]:
+                    if subgroup['name'] == name_or_path or subgroup['path'] == name_or_path:
+                        return subgroup
+
+        return None
+
+    def create_group(self, name=None, client_roles={}, realm_roles=[], sub_groups=[], path=None, parent=None):
+        """
+        Create a group in the Realm
+
+        GroupRepresentation
+        http://www.keycloak.org/docs-api/3.2/rest-api/#_grouprepresentation
+
+        :param name: group name
+        :param client_roles: (Dict) Client roles to include in groupp # Not demonstrated to work
+        :param realm_roles: (List) Realm roles to include in group # Not demonstrated to work
+        :param sub_groups: (List) Subgroups to include in groupp # Not demonstrated to work
+        :param path: group path
+        :param parent: parent group's id. Required to create a sub-group.
+
+        :return: Keycloak server response (GroupRepresentation)
+        """
+
+        data = {"name": name or path,
+                "path": path,
+                "clientRoles": client_roles,
+                "realmRoles": realm_roles,
+                "subGroups": sub_groups}
+
+        if parent is None:
+            params_path = {"realm-name": self.realm_name}
+            data_raw = self.connection.raw_post(URL_ADMIN_GROUPS.format(**params_path),
+                                                data=json.dumps(data))
+        else:
+            params_path = {"realm-name": self.realm_name, "id": parent}
+            data_raw = self.connection.raw_post(URL_ADMIN_GROUP_CHILD.format(**params_path),
+                                                data=json.dumps(data))
+
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=201)
+
+    def group_set_permissions(self, group_id, enabled=True):
+        """
+        Enable/Disable permissions for a group. Cannot delete group if disabled
+
+        :param group_id: id of group
+        :param enabled: boolean
+        :return: Keycloak server response
+        """
+
+        params_path = {"realm-name": self.realm_name, "id": group_id}
+        data_raw = self.connection.raw_put(URL_ADMIN_GROUP_PERMISSIONS.format(**params_path),
+                                           data=json.dumps({"enabled": enabled}))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def group_user_add(self, user_id, group_id):
+        """
+        Add user to group (user_id and group_id)
+
+        :param group_id:  id of group
+        :param user_id:  id of user
+        :param group_id:  id of group to add to
+        :return: Keycloak server response
+        """
+
+        params_path = {"realm-name": self.realm_name, "id": user_id, "group-id": group_id}
+        data_raw = self.connection.raw_put(URL_ADMIN_USER_GROUP.format(**params_path), data=None)
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=204)
+
+    def group_user_remove(self, user_id, group_id):
+        """
+        Remove user from group (user_id and group_id)
+
+        :param group_id:  id of group
+        :param user_id:  id of user
+        :param group_id:  id of group to add to
+        :return: Keycloak server response
+        """
+
+        params_path = {"realm-name": self.realm_name, "id": user_id, "group-id": group_id}
+        data_raw = self.connection.raw_delete(URL_ADMIN_USER_GROUP.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=204)
+
+    def delete_group(self, group_id):
+        """
+        Deletes a group in the Realm
+
+        :param group_id:  id of group to delete
+        :return: Keycloak server response
+        """
+
+        params_path = {"realm-name": self.realm_name, "id": group_id}
+        data_raw = self.connection.raw_delete(URL_ADMIN_GROUP.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=204)
+
+    def get_clients(self):
+        """
+        Get clients belonging to the realm Returns a list of clients belonging to the realm
+
+        ClientRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_clientrepresentation
+
+        :return: Keycloak server response (ClientRepresentation)
+        """
+
+        params_path = {"realm-name": self.realm_name}
+        data_raw = self.connection.raw_get(URL_ADMIN_CLIENTS.format(**params_path))
+        
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_client(self, client_id):
+        """
+        Get representation of the client
+
+        ClientRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_clientrepresentation
+
+        :param client_id:  id of client (not client-id)
+        :return: Keycloak server response (ClientRepresentation)
+        """
+
+        params_path = {"realm-name": self.realm_name, "id": client_id}
+        data_raw = self.connection.raw_get(URL_ADMIN_CLIENT.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_client_id(self, client_name):
+        """
+        Get internal keycloak client id from client-id.
+        This is required for further actions against this client.
+
+        :param client_name: name in ClientRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_clientrepresentation
+        :return: client_id (uuid as string)
+        """
+
+        clients = self.get_clients()
+
+        for client in clients:
+            if client_name == client['name']:
+                return client["id"]
+
+        return None
+
+    def create_client(self, payload):
+        """
+        Create a client
+
+        ClientRepresentation: http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_clientrepresentation
+
+        :param payload: ClientRepresentation
+        :return:  Keycloak server response (UserRepresentation)
+        """
+
+        params_path = {"realm-name": self.realm_name}
+        data_raw = self.connection.raw_post(URL_ADMIN_CLIENTS.format(**params_path),
+                                            data=json.dumps(payload))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=201)
+
+    def delete_client(self, client_id):
+        """
+        Get representation of the client
+
+        ClientRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_clientrepresentation
+
+        :param client_id: keycloak client id (not oauth client-id)
+        :return: Keycloak server response (ClientRepresentation)
+        """
+
+        params_path = {"realm-name": self.realm_name, "id": client_id}
+        data_raw = self.connection.raw_delete(URL_ADMIN_CLIENT.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=204)
+
+    def get_realm_roles(self):
+        """
+        Get all roles for the realm or client
+
+        RoleRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_rolerepresentation
+
+        :return: Keycloak server response (RoleRepresentation)
+        """
+
+        params_path = {"realm-name": self.realm_name}
+        data_raw = self.connection.raw_get(URL_ADMIN_REALM_ROLES.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_client_roles(self, client_id):
+        """
+        Get all roles for the client
+
+        :param client_id: id of client (not client-id)
+
+        RoleRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_rolerepresentation
+
+        :return: Keycloak server response (RoleRepresentation)
+        """
+
+        params_path = {"realm-name": self.realm_name, "id": client_id}
+        data_raw = self.connection.raw_get(URL_ADMIN_CLIENT_ROLES.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_client_role(self, client_id, role_name):
+        """
+        Get client role id by name
+        This is required for further actions with this role.
+
+        :param client_id: id of client (not client-id)
+        :param role_name: role’s name (not id!)
+
+        RoleRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_rolerepresentation
+
+        :return: role_id
+        """
+        params_path = {"realm-name": self.realm_name, "id": client_id, "role-name": role_name}
+        data_raw = self.connection.raw_get(URL_ADMIN_CLIENT_ROLE.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def get_client_role_id(self, client_id, role_name):
+        """
+        Warning: Deprecated
+
+        Get client role id by name
+        This is required for further actions with this role.
+
+        :param client_id: id of client (not client-id)
+        :param role_name: role’s name (not id!)
+
+        RoleRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_rolerepresentation
+
+        :return: role_id
+        """
+        role = self.get_client_role(client_id, role_name)
+        return role.get("id")
+
+    def create_client_role(self, payload):
+        """
+        Create a client role
+
+        RoleRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_rolerepresentation
+
+        :param payload: id of client (not client-id), role_name: name of role
+        :return: Keycloak server response (RoleRepresentation)
+        """
+
+        params_path = {"realm-name": self.realm_name, "id": self.client_id}
+        data_raw = self.connection.raw_post(URL_ADMIN_CLIENT_ROLES.format(**params_path),
+                                            data=json.dumps(payload))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=201)
+
+    def delete_client_role(self, role_name):
+        """
+        Create a client role
+
+        RoleRepresentation
+        http://www.keycloak.org/docs-api/3.3/rest-api/index.html#_rolerepresentation
+
+        :param role_name: role’s name (not id!)
+        """
+        params_path = {"realm-name": self.realm_name, "id": self.client_id, "role-name": role_name}
+        data_raw = self.connection.raw_delete(URL_ADMIN_CLIENT_ROLE.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=204)
+
+    def assign_client_role(self, user_id, client_id, roles):
+        """
+        Assign a client role to a user
+
+        :param client_id: id of client (not client-id)
+        :param user_id: id of user
+        :param client_id: id of client containing role,
+        :param roles: roles list or role (use RoleRepresentation)
+        :return Keycloak server response
+        """
+
+        payload = roles if isinstance(roles, list) else [roles]
+        params_path = {"realm-name": self.realm_name, "id": user_id, "client-id": client_id}
+        data_raw = self.connection.raw_post(URL_ADMIN_USER_CLIENT_ROLES.format(**params_path),
+                                            data=json.dumps(payload))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=204)
+
+    def sync_users(self, storage_id, action):
+        """
+        Function to trigger user sync from provider
+
+        :param storage_id:
+        :param action:
+        :return:
+        """
+        data = {'action': action}
+        params_query = {"action": action}
+
+        params_path = {"realm-name": self.realm_name, "id": storage_id}
+        data_raw = self.connection.raw_post(URL_ADMIN_USER_STORAGE.format(**params_path),
+                                            data=json.dumps(data), **params_query)
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def import_realm(self, payload):
+        """
+        Imports a realm from a full representation of that realm
+
+        Realmrepresentation
+        http://www.keycloak.org/docs-api/2.5/rest-api/index.html#_import_a_realm
+
+        :param payload: Realmrepresentation
+
+        :return: Realmrepresentation
+        """
+        data_raw = self.connection.raw_post(URL_ADMIN_REALM, 
+                                            data = json.dumps(payload))
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=201)
\ No newline at end of file
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_main.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_main.py
new file mode 100644
index 000000000..4705499cb
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_main.py
@@ -0,0 +1,89 @@
+import json
+
+from keycloak import KeycloakOpenID
+from keycloak import KeycloakAdmin
+import urllib2, argparse, json
+
+# Import realm
+def keycloak_import_realm(keycloak_realm_file):
+    data = json.load(open(keycloak_realm_file))
+    realm_import = keycloak_admin.import_realm(data)
+
+# Add user and set password
+def keycloak_create_user(email, username, firstName, lastName, password):
+    new_user = keycloak_admin.create_user({"email": email,
+                    "username": username,
+                    "emailVerified": True,
+                    "enabled": True,
+                    "firstName": firstName,
+                    "lastName": lastName,
+                    "credentials": [{"value": "12345","type": password}],
+                    "realmRoles": ["user_default"]})
+
+# Create the user and assign the role to access the user management API
+def update_user_roles(config):
+    realm_json = json.load(open(config['keycloak_realm_json_file_path']))
+
+    # Get the id of realm-management
+    for client in realm_json['clients']:
+        if config['clientId'] == client['clientId']:
+            client_id = client["id"]
+            break
+
+    user = keycloak_admin.get_users({"username":config['keycloak_api_management_username']})
+    user_id = user[0]['id']
+
+    # Read the role from file
+    with open(config['keycloak_user_manager_roles_json_file_path'], 'r') as data_file:
+        json_data = data_file.read()
+
+    roles = json.loads(json_data)
+
+    # Get only client roles
+    clientRoles = roles[config['clientId']]
+
+    keycloak_admin.assign_client_role(user_id, client_id, clientRoles)
+
+if  __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Configure keycloak user apis')
+    parser.add_argument('keycloak_bootstrap_config', help='configuration json file that is needed for keycloak bootstrap')
+    args = parser.parse_args()
+
+    with open(args.keycloak_bootstrap_config) as keycloak_bootstrap_config:
+        config = json.load(keycloak_bootstrap_config)
+
+    try:
+        # Get access token
+        keycloak_admin = KeycloakAdmin(server_url=config['keycloak_auth_server_url'],
+                            username=config['keycloak_management_user'],
+                            password=config['keycloak_management_password'],
+                            realm_name="master",
+                            client_id='admin-cli',
+                            verify=False)
+        # Import realm
+        keycloak_import_realm(config['keycloak_realm_json_file_path'])
+
+        # Set realm name to sunbird
+        keycloak_admin.realm_name = config['keycloak_realm']
+
+        # Add user for user api
+        keycloak_create_user(email=config['keycloak_api_management_user_email'],
+            username=config['keycloak_api_management_username'],
+            firstName=config['keycloak_api_management_user_first_name'],
+            lastName=config['keycloak_api_management_user_last_name'],
+            password=config['keycloak_api_management_user_password'])
+
+        # Update user roles for access user management API's
+        config['clientId'] = "realm-management"
+        update_user_roles(config)
+
+        # Update user roles for SSO
+        config['clientId'] = "admin-cli"
+        update_user_roles(config)
+    # If keycloak is returning the error realm does exists
+    except Exception as e:
+        if "409" in str(e):
+            print "Skipping error: " + str(e)
+        else:
+            raise
+
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_openid.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_openid.py
new file mode 100644
index 000000000..f1dcde44e
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_openid.py
@@ -0,0 +1,390 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from .authorization import Authorization
+from .exceptions import raise_error_from_response, KeycloakGetError, \
+    KeycloakRPTNotFound, KeycloakAuthorizationConfigError, KeycloakInvalidTokenError
+from .urls_patterns import (
+    URL_TOKEN,
+    URL_USERINFO,
+    URL_WELL_KNOWN,
+    URL_LOGOUT,
+    URL_CERTS,
+    URL_ENTITLEMENT,
+    URL_INTROSPECT
+)
+from .connection import ConnectionManager
+from jose import jwt
+import json
+
+
+class KeycloakOpenID:
+
+    def __init__(self, server_url, realm_name, client_id, client_secret_key=None, verify=True):
+        """
+
+        :param server_url: Keycloak server url
+        :param client_id: client id
+        :param realm_name: realm name
+        :param client_secret_key: client secret key
+        :param verify: True if want check connection SSL
+        """
+        self._client_id = client_id
+        self._client_secret_key = client_secret_key
+        self._realm_name = realm_name
+        self._connection = ConnectionManager(base_url=server_url,
+                                             headers={},
+                                             timeout=60,
+                                             verify=verify)
+
+        self._authorization = Authorization()
+
+    @property
+    def client_id(self):
+        return self._client_id
+
+    @client_id.setter
+    def client_id(self, value):
+        self._client_id = value
+
+    @property
+    def client_secret_key(self):
+        return self._client_secret_key
+
+    @client_secret_key.setter
+    def client_secret_key(self, value):
+        self._client_secret_key = value
+
+    @property
+    def realm_name(self):
+        return self._realm_name
+
+    @realm_name.setter
+    def realm_name(self, value):
+        self._realm_name = value
+
+    @property
+    def connection(self):
+        return self._connection
+
+    @connection.setter
+    def connection(self, value):
+        self._connection = value
+
+    @property
+    def authorization(self):
+        return self._authorization
+
+    @authorization.setter
+    def authorization(self, value):
+        self._authorization = value
+
+    def _add_secret_key(self, payload):
+        """
+        Add secret key if exist.
+
+        :param payload:
+        :return:
+        """
+        if self.client_secret_key:
+            payload.update({"client_secret": self.client_secret_key})
+
+        return payload
+
+    def _build_name_role(self, role):
+        """
+
+        :param role:
+        :return:
+        """
+        return self.client_id + "/" + role
+
+    def _token_info(self, token, method_token_info, **kwargs):
+        """
+
+        :param token:
+        :param method_token_info:
+        :param kwargs:
+        :return:
+        """
+        if method_token_info == 'introspect':
+            token_info = self.introspect(token)
+        else:
+            token_info = self.decode_token(token, **kwargs)
+
+        return token_info
+
+    def well_know(self):
+        """ The most important endpoint to understand is the well-known configuration
+            endpoint. It lists endpoints and other configuration options relevant to
+            the OpenID Connect implementation in Keycloak.
+
+            :return It lists endpoints and other configuration options relevant.
+        """
+
+        params_path = {"realm-name": self.realm_name}
+        data_raw = self.connection.raw_get(URL_WELL_KNOWN.format(**params_path))
+
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def auth_url(self, redirect_uri):
+        """
+
+        http://openid.net/specs/openid-connect-core-1_0.html#AuthorizationEndpoint
+
+        :return:
+        """
+        return NotImplemented
+
+    def token(self, username, password, grant_type=["password"]):
+        """
+        The token endpoint is used to obtain tokens. Tokens can either be obtained by
+        exchanging an authorization code or by supplying credentials directly depending on
+        what flow is used. The token endpoint is also used to obtain new access tokens
+        when they expire.
+
+        http://openid.net/specs/openid-connect-core-1_0.html#TokenEndpoint
+
+        :param username:
+        :param password:
+        :param grant_type:
+        :return:
+        """
+        params_path = {"realm-name": self.realm_name}
+        payload = {"username": username, "password": password,
+                   "client_id": self.client_id, "grant_type": grant_type}
+
+        payload = self._add_secret_key(payload)
+        data_raw = self.connection.raw_post(URL_TOKEN.format(**params_path),
+                                            data=payload)
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def refresh_token(self, refresh_token, grant_type=["refresh_token"]):
+        """
+        The token endpoint is used to obtain tokens. Tokens can either be obtained by
+        exchanging an authorization code or by supplying credentials directly depending on
+        what flow is used. The token endpoint is also used to obtain new access tokens
+        when they expire.
+
+        http://openid.net/specs/openid-connect-core-1_0.html#TokenEndpoint
+
+        :param refresh_token:
+        :param grant_type:
+        :return:
+        """
+        params_path = {"realm-name": self.realm_name}
+        payload = {"client_id": self.client_id, "grant_type": grant_type, "refresh_token": refresh_token}
+        payload = self._add_secret_key(payload)
+        data_raw = self.connection.raw_post(URL_TOKEN.format(**params_path),
+                                            data=payload)
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def userinfo(self, token):
+        """
+        The userinfo endpoint returns standard claims about the authenticated user,
+        and is protected by a bearer token.
+
+        http://openid.net/specs/openid-connect-core-1_0.html#UserInfo
+
+        :param token:
+        :return:
+        """
+
+        self.connection.add_param_headers("Authorization", "Bearer " + token)
+        params_path = {"realm-name": self.realm_name}
+
+        data_raw = self.connection.raw_get(URL_USERINFO.format(**params_path))
+
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def logout(self, refresh_token):
+        """
+        The logout endpoint logs out the authenticated user.
+        :param refresh_token:
+        :return:
+        """
+        params_path = {"realm-name": self.realm_name}
+        payload = {"client_id": self.client_id, "refresh_token": refresh_token}
+
+        payload = self._add_secret_key(payload)
+        data_raw = self.connection.raw_post(URL_LOGOUT.format(**params_path),
+                                            data=payload)
+
+        return raise_error_from_response(data_raw, KeycloakGetError, expected_code=204)
+
+    def certs(self):
+        """
+        The certificate endpoint returns the public keys enabled by the realm, encoded as a
+        JSON Web Key (JWK). Depending on the realm settings there can be one or more keys enabled
+        for verifying tokens.
+
+        https://tools.ietf.org/html/rfc7517
+
+        :return:
+        """
+        params_path = {"realm-name": self.realm_name}
+        data_raw = self.connection.raw_get(URL_CERTS.format(**params_path))
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def entitlement(self, token, resource_server_id):
+        """
+        Client applications can use a specific endpoint to obtain a special security token
+        called a requesting party token (RPT). This token consists of all the entitlements
+        (or permissions) for a user as a result of the evaluation of the permissions and authorization
+        policies associated with the resources being requested. With an RPT, client applications can
+        gain access to protected resources at the resource server.
+
+        :return:
+        """
+        self.connection.add_param_headers("Authorization", "Bearer " + token)
+        params_path = {"realm-name": self.realm_name, "resource-server-id": resource_server_id}
+        data_raw = self.connection.raw_get(URL_ENTITLEMENT.format(**params_path))
+
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def introspect(self, token, rpt=None, token_type_hint=None):
+        """
+        The introspection endpoint is used to retrieve the active state of a token. It is can only be
+        invoked by confidential clients.
+
+        https://tools.ietf.org/html/rfc7662
+
+        :param token:
+        :param rpt:
+        :param token_type_hint:
+
+        :return:
+        """
+        params_path = {"realm-name": self.realm_name}
+
+        payload = {"client_id": self.client_id, "token": token}
+
+        if token_type_hint == 'requesting_party_token':
+            if rpt:
+                payload.update({"token": rpt, "token_type_hint": token_type_hint})
+                self.connection.add_param_headers("Authorization", "Bearer " + token)
+            else:
+                raise KeycloakRPTNotFound("Can't found RPT.")
+
+        payload = self._add_secret_key(payload)
+
+        data_raw = self.connection.raw_post(URL_INTROSPECT.format(**params_path),
+                                            data=payload)
+
+        return raise_error_from_response(data_raw, KeycloakGetError)
+
+    def decode_token(self, token, key, algorithms=['RS256'], **kwargs):
+        """
+        A JSON Web Key (JWK) is a JavaScript Object Notation (JSON) data
+        structure that represents a cryptographic key.  This specification
+        also defines a JWK Set JSON data structure that represents a set of
+        JWKs.  Cryptographic algorithms and identifiers for use with this
+        specification are described in the separate JSON Web Algorithms (JWA)
+        specification and IANA registries established by that specification.
+
+        https://tools.ietf.org/html/rfc7517
+
+        :param token:
+        :param key:
+        :param algorithms:
+        :return:
+        """
+
+        return jwt.decode(token, key, algorithms=algorithms,
+                          audience=self.client_id, **kwargs)
+
+    def load_authorization_config(self, path):
+        """
+        Load Keycloak settings (authorization)
+
+        :param path: settings file (json)
+        :return:
+        """
+        authorization_file = open(path, 'r')
+        authorization_json = json.loads(authorization_file.read())
+        self.authorization.load_config(authorization_json)
+        authorization_file.close()
+
+    def get_policies(self, token, method_token_info='introspect', **kwargs):
+        """
+        Get policies by user token
+
+        :param token: user token
+        :return: policies list
+        """
+
+        if not self.authorization.policies:
+            raise KeycloakAuthorizationConfigError(
+                "Keycloak settings not found. Load Authorization Keycloak settings."
+            )
+
+        token_info = self._token_info(token, method_token_info, **kwargs)
+
+        if method_token_info == 'introspect' and not token_info['active']:
+            raise KeycloakInvalidTokenError(
+                "Token expired or invalid."
+            )
+
+        user_resources = token_info['resource_access'].get(self.client_id)
+
+        if not user_resources:
+            return None
+
+        policies = []
+
+        for policy_name, policy in self.authorization.policies.items():
+            for role in user_resources['roles']:
+                if self._build_name_role(role) in policy.roles:
+                    policies.append(policy)
+
+        return list(set(policies))
+
+    def get_permissions(self, token, method_token_info='introspect', **kwargs):
+        """
+        Get permission by user token
+
+        :param token: user token
+        :param method_token_info: Decode token method
+        :param kwargs: parameters for decode
+        :return: permissions list
+        """
+
+        if not self.authorization.policies:
+            raise KeycloakAuthorizationConfigError(
+                "Keycloak settings not found. Load Authorization Keycloak settings."
+            )
+
+        token_info = self._token_info(token, method_token_info, **kwargs)
+
+        if method_token_info == 'introspect' and not token_info['active']:
+            raise KeycloakInvalidTokenError(
+                "Token expired or invalid."
+            )
+
+        user_resources = token_info['resource_access'].get(self.client_id)
+
+        if not user_resources:
+            return None
+
+        permissions = []
+
+        for policy_name, policy in self.authorization.policies.items():
+            for role in user_resources['roles']:
+                if self._build_name_role(role) in policy.roles:
+                    permissions += policy.permissions
+
+        return list(set(permissions))
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_patch.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_patch.py
new file mode 100644
index 000000000..8c0e811f6
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/keycloak_patch.py
@@ -0,0 +1,54 @@
+import json
+
+from keycloak import KeycloakOpenID
+from keycloak import KeycloakAdmin
+import urllib2, argparse, json
+
+# Create client
+def keycloak_create_client(config):
+    data = json.load(open(config['keycloak_clients']))
+    
+    # Get the existing clients
+    keycloak_admin.realm_name = config['keycloak_realm']    
+    clients = keycloak_admin.get_clients()
+    
+    # 1. Read the clients to be added from json
+    # 2. Check if client already exists in keycloak
+    # 3. Add the client if not exist
+    for rec in data['clients']:
+        client_exist_falg = 0
+        for client in clients:
+            if rec['clientId'] == client['clientId']:
+                client_exist_falg = 1
+                break
+        if (client_exist_falg == 0):
+            keycloak_admin.create_client(rec)
+            print rec['clientId'] + " client created"
+        else :
+            print rec['clientId'] + " client already exist"
+
+if  __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Configure keycloak user apis')
+    parser.add_argument('keycloak_bootstrap_config', help='configuration json file that is needed for keycloak bootstrap')
+    args = parser.parse_args()
+
+    with open(args.keycloak_bootstrap_config) as keycloak_bootstrap_config:
+        config = json.load(keycloak_bootstrap_config)
+
+    try:
+        # Get access token
+        keycloak_admin = KeycloakAdmin(server_url=config['keycloak_auth_server_url'],
+                            username=config['keycloak_management_user'],
+                            password=config['keycloak_management_password'],
+                            realm_name="master",
+                            client_id='admin-cli',
+                            verify=False)
+        
+
+        # Create clients
+        keycloak_create_client(config)
+
+    except urllib2.HTTPError as e:
+        error_message = e.read()
+        print(error_message)
+        raise
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/PKG-INFO b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/PKG-INFO
new file mode 100644
index 000000000..e98a1ee3c
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/PKG-INFO
@@ -0,0 +1,18 @@
+Metadata-Version: 1.1
+Name: python-keycloak
+Version: 0.12.0
+Summary: python-keycloak is a Python package providing access to the Keycloak API.
+Home-page: https://bitbucket.org/agriness/python-keycloak
+Author: Marcos Pereira
+Author-email: marcospereira.mpj@gmail.com
+License: GNU General Public License - V3
+Description: UNKNOWN
+Keywords: keycloak openid
+Platform: UNKNOWN
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Development Status :: 3 - Alpha
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Unix
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Topic :: Utilities
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/SOURCES.txt b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/SOURCES.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/dependency_links.txt b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/dependency_links.txt
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/requires.txt b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/requires.txt
new file mode 100644
index 000000000..d6eafdf65
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/requires.txt
@@ -0,0 +1,3 @@
+requests==2.18.4
+httmock==1.2.5
+python-jose==1.4.0
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/top_level.txt b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/top_level.txt
new file mode 100644
index 000000000..26c07c1da
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/python_keycloak.egg-info/top_level.txt
@@ -0,0 +1 @@
+keycloak
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/tests/__init__.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/tests/test_connection.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/tests/test_connection.py
new file mode 100644
index 000000000..97ec1792d
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/tests/test_connection.py
@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from httmock import urlmatch, response, HTTMock, all_requests
+
+from ..connection import ConnectionManager
+
+
+try:
+    import unittest
+except ImportError:
+    import unittest2 as unittest
+
+    
+class TestConnection(unittest.TestCase):
+    
+    def setUp(self):
+        self._conn = ConnectionManager(
+                            base_url="http://localhost:8080/",
+                            headers={}, 
+                            timeout=60)
+
+    @all_requests
+    def response_content_success(self, url, request):
+        headers = {'content-type': 'application/json'}
+        content = b'response_ok'
+        return response(200, content, headers, None, 5, request)
+        
+    def test_raw_get(self):            
+        with HTTMock(self.response_content_success):
+            resp = self._conn.raw_get("/known_path")
+        self.assertEqual(resp.content, b'response_ok')
+        self.assertEqual(resp.status_code, 200) 
+
+    def test_raw_post(self):
+
+        @urlmatch(path="/known_path", method="post")
+        def response_post_success(url, request):
+            headers = {'content-type': 'application/json'}
+            content = 'response'.encode("utf-8")
+            return response(201, content, headers, None, 5, request)
+                 
+        with HTTMock(response_post_success):
+            resp = self._conn.raw_post("/known_path",
+                                        {'field': 'value'})
+        self.assertEqual(resp.content, b'response')
+        self.assertEqual(resp.status_code, 201)
+
+    def test_raw_put(self):
+        @urlmatch(netloc="localhost", path="/known_path", method="put")
+        def response_put_success(url, request):
+            headers = {'content-type': 'application/json'}
+            content = 'response'.encode("utf-8")
+            return response(200, content, headers, None, 5, request)
+
+        with HTTMock(response_put_success):
+            resp = self._conn.raw_put("/known_path",
+                                       {'field': 'value'})
+        self.assertEqual(resp.content, b'response')
+        self.assertEqual(resp.status_code, 200)
+
+    def test_raw_get_fail(self):
+
+        @urlmatch(netloc="localhost", path="/known_path", method="get")
+        def response_get_fail(url, request):
+            headers = {'content-type': 'application/json'}
+            content = "404 page not found".encode("utf-8")
+            return response(404, content, headers, None, 5, request)
+                 
+        with HTTMock(response_get_fail):
+            resp = self._conn.raw_get("/known_path")
+
+        self.assertEqual(resp.content, b"404 page not found")
+        self.assertEqual(resp.status_code, 404)   
+        
+    def test_raw_post_fail(self):
+
+        @urlmatch(netloc="localhost", path="/known_path", method="post")
+        def response_post_fail(url, request):
+            headers = {'content-type': 'application/json'}
+            content = str(["Start can't be blank"]).encode("utf-8")
+            return response(404, content, headers, None, 5, request)
+                 
+        with HTTMock(response_post_fail):
+            resp = self._conn.raw_post("/known_path",
+                                       {'field': 'value'})
+        self.assertEqual(resp.content, str(["Start can't be blank"]).encode("utf-8"))
+        self.assertEqual(resp.status_code, 404)
+
+    def test_raw_put_fail(self):
+
+        @urlmatch(netloc="localhost", path="/known_path", method="put")
+        def response_put_fail(url, request):
+            headers = {'content-type': 'application/json'}
+            content = str(["Start can't be blank"]).encode("utf-8")
+            return response(404, content, headers, None, 5, request)
+
+        with HTTMock(response_put_fail):
+            resp = self._conn.raw_put("/known_path",
+                                      {'field': 'value'})
+        self.assertEqual(resp.content, str(["Start can't be blank"]).encode("utf-8"))
+        self.assertEqual(resp.status_code, 404)
+
+    def test_add_param_headers(self):
+        self._conn.add_param_headers("test", "value")
+        self.assertEqual(self._conn.headers,
+                         {"test": "value"})
+
+    def test_del_param_headers(self):
+        self._conn.add_param_headers("test", "value")
+        self._conn.del_param_headers("test")
+        self.assertEqual(self._conn.headers, {})
+    
+    def test_clean_param_headers(self):
+        self._conn.add_param_headers("test", "value")
+        self.assertEqual(self._conn.headers,
+                         {"test": "value"})
+        self._conn.clean_headers()
+        self.assertEqual(self._conn.headers, {})
+
+    def test_exist_param_headers(self):
+        self._conn.add_param_headers("test", "value")
+        self.assertTrue(self._conn.exist_param_headers("test"))
+        self.assertFalse(self._conn.exist_param_headers("test_no"))
+        
+    def test_get_param_headers(self):
+        self._conn.add_param_headers("test", "value")
+        self.assertTrue(self._conn.exist_param_headers("test"))
+        self.assertFalse(self._conn.exist_param_headers("test_no"))
+        
+    def test_get_headers(self):
+        self._conn.add_param_headers("test", "value")
+        self.assertEqual(self._conn.headers,
+                         {"test": "value"})
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/urls_patterns.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/urls_patterns.py
new file mode 100644
index 000000000..b57212950
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/keycloak/urls_patterns.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Marcos Pereira <marcospereira.mpj@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# OPENID URLS
+URL_WELL_KNOWN = "realms/{realm-name}/.well-known/openid-configuration"
+URL_TOKEN = "realms/{realm-name}/protocol/openid-connect/token"
+URL_USERINFO = "realms/{realm-name}/protocol/openid-connect/userinfo"
+URL_LOGOUT = "realms/{realm-name}/protocol/openid-connect/logout"
+URL_CERTS = "realms/{realm-name}/protocol/openid-connect/certs"
+URL_INTROSPECT = "realms/{realm-name}/protocol/openid-connect/token/introspect"
+URL_ENTITLEMENT = "realms/{realm-name}/authz/entitlement/{resource-server-id}"
+
+# ADMIN URLS
+URL_ADMIN_USERS = "admin/realms/{realm-name}/users"
+URL_ADMIN_USERS_COUNT = "admin/realms/{realm-name}/users/count"
+URL_ADMIN_USER = "admin/realms/{realm-name}/users/{id}"
+URL_ADMIN_USER_CONSENTS = "admin/realms/{realm-name}/users/{id}/consents"
+URL_ADMIN_SEND_UPDATE_ACCOUNT = "admin/realms/{realm-name}/users/{id}/execute-actions-email"
+URL_ADMIN_SEND_VERIFY_EMAIL = "admin/realms/{realm-name}/users/{id}/send-verify-email"
+URL_ADMIN_RESET_PASSWORD = "admin/realms/{realm-name}/users/{id}/reset-password"
+URL_ADMIN_GET_SESSIONS = "admin/realms/{realm-name}/users/{id}/sessions"
+URL_ADMIN_USER_CLIENT_ROLES = "admin/realms/{realm-name}/users/{id}/role-mappings/clients/{client-id}"
+URL_ADMIN_USER_GROUP = "admin/realms/{realm-name}/users/{id}/groups/{group-id}"
+
+URL_ADMIN_SERVER_INFO = "admin/serverinfo"
+
+URL_ADMIN_GROUPS = "admin/realms/{realm-name}/groups"
+URL_ADMIN_GROUP = "admin/realms/{realm-name}/groups/{id}"
+URL_ADMIN_GROUP_CHILD = "admin/realms/{realm-name}/groups/{id}/children"
+URL_ADMIN_GROUP_PERMISSIONS = "admin/realms/{realm-name}/groups/{id}/management/permissions"
+
+URL_ADMIN_CLIENTS = "admin/realms/{realm-name}/clients"
+URL_ADMIN_CLIENT = "admin/realms/{realm-name}/clients/{id}"
+URL_ADMIN_CLIENT_ROLES = "admin/realms/{realm-name}/clients/{id}/roles"
+URL_ADMIN_CLIENT_ROLE = "admin/realms/{realm-name}/clients/{id}/roles/{role-name}"
+
+URL_ADMIN_REALM_ROLES = "admin/realms/{realm-name}/roles"
+
+URL_ADMIN_USER_STORAGE = "admin/realms/{realm-name}/user-storage/{id}/sync"
+URL_ADMIN_REALM = "admin/realms"
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/PKG-INFO b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/PKG-INFO
new file mode 100644
index 000000000..e98a1ee3c
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/PKG-INFO
@@ -0,0 +1,18 @@
+Metadata-Version: 1.1
+Name: python-keycloak
+Version: 0.12.0
+Summary: python-keycloak is a Python package providing access to the Keycloak API.
+Home-page: https://bitbucket.org/agriness/python-keycloak
+Author: Marcos Pereira
+Author-email: marcospereira.mpj@gmail.com
+License: GNU General Public License - V3
+Description: UNKNOWN
+Keywords: keycloak openid
+Platform: UNKNOWN
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Development Status :: 3 - Alpha
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Unix
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Topic :: Utilities
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/SOURCES.txt b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/SOURCES.txt
new file mode 100644
index 000000000..d948eb4a5
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/SOURCES.txt
@@ -0,0 +1,21 @@
+README.md
+setup.cfg
+setup.py
+keycloak/__init__.py
+keycloak/connection.py
+keycloak/exceptions.py
+keycloak/keycloak_admin.py
+keycloak/keycloak_main.py
+keycloak/keycloak_openid.py
+keycloak/urls_patterns.py
+keycloak/authorization/__init__.py
+keycloak/authorization/permission.py
+keycloak/authorization/policy.py
+keycloak/authorization/role.py
+keycloak/tests/__init__.py
+keycloak/tests/test_connection.py
+python_keycloak.egg-info/PKG-INFO
+python_keycloak.egg-info/SOURCES.txt
+python_keycloak.egg-info/dependency_links.txt
+python_keycloak.egg-info/requires.txt
+python_keycloak.egg-info/top_level.txt
\ No newline at end of file
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/dependency_links.txt b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/dependency_links.txt
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/requires.txt b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/requires.txt
new file mode 100644
index 000000000..f3221c8ab
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/requires.txt
@@ -0,0 +1,3 @@
+requests==2.20.0
+httmock==1.2.5
+python-jose==1.4.0
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/top_level.txt b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/top_level.txt
new file mode 100644
index 000000000..26c07c1da
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/python_keycloak.egg-info/top_level.txt
@@ -0,0 +1 @@
+keycloak
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/roles.json b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/roles.json
new file mode 100644
index 000000000..cc5e0b324
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/roles.json
@@ -0,0 +1,41 @@
+{
+    "realm-management" : [
+        {
+            "id": "3ff462fc-b33c-431a-b54b-861c3298d910",
+            "name": "manage-users",
+            "description": "${role_manage-users}",
+            "scopeParamRequired": false,
+            "composite": false,"clientRole": true,
+            "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+            "id": "57118202-c5e5-4c49-829b-c2ed796bfdea",
+            "name": "query-users",
+            "description": "${role_query-users}",
+            "scopeParamRequired": false,
+            "composite": false,
+            "clientRole": true,
+            "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+            "id":"46019462-3dc8-46a8-9786-ffcbad293f43",
+            "name":"view-users",
+            "description":"${role_view-users}",
+            "scopeParamRequired":false,
+            "composite":true,
+            "clientRole":true,
+            "containerId":"b2f45201-1362-4b10-83c3-207d470f44bf"
+        }
+    ],
+    "admin-cli": [
+        {
+            "id":"30ab6b4f-b17c-4fff-a5fa-1181686bb409",
+            "name":"admin",
+            "description":"admin role",
+            "scopeParamRequired":false,
+            "composite":true,
+            "clientRole":true,
+            "containerId":"8891d8e9-35e6-4a1c-b32b-027be03b0f24"
+        }
+    ]
+}
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/setup.cfg b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/setup.cfg
new file mode 100644
index 000000000..9f88734b5
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/setup.cfg
@@ -0,0 +1,7 @@
+[metadata]
+description-file = README.md
+
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff --git a/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/setup.py b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/setup.py
new file mode 100644
index 000000000..7f8e077f9
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/files/python-keycloak-0.12.0/setup.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+from setuptools import setup
+
+setup(
+    name='python-keycloak',
+    version='0.12.0',
+    url='https://bitbucket.org/agriness/python-keycloak',
+    license='GNU General Public License - V3',
+    author='Marcos Pereira',
+    author_email='marcospereira.mpj@gmail.com',
+    keywords='keycloak openid',
+    description=u'python-keycloak is a Python package providing access to the Keycloak API.',
+    packages=['keycloak', 'keycloak.authorization', 'keycloak.tests'],
+    install_requires=['requests==2.20.0', 'httmock==1.2.5', 'python-jose==1.4.0'],
+    classifiers=[
+        'Programming Language :: Python :: 3',
+        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+        'Development Status :: 3 - Alpha',
+        'Operating System :: MacOS',
+        'Operating System :: Unix',
+        'Operating System :: Microsoft :: Windows',
+        'Topic :: Utilities'
+    ]
+)
diff --git a/ansible/roles/keycloak-deploy-6.0/tasks/bootstrap.yml b/ansible/roles/keycloak-deploy-6.0/tasks/bootstrap.yml
new file mode 100644
index 000000000..bd8eda695
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/tasks/bootstrap.yml
@@ -0,0 +1,91 @@
+---
+- name: start service
+  become: true
+  command: /etc/init.d/keycloak start
+  poll: 5
+  async: 5
+  ignore_errors: true
+
+- name: Create admin user
+  become_user: "{{ wildfly_user }}"
+  command: "{{ wildfly_dir }}/bin/add-user-keycloak.sh -r master -u {{ keycloak_management_user }} -p {{ keycloak_management_password }}"
+  when: keycloak_management_user is defined and
+        keycloak_management_password is defined
+  ignore_errors: true
+
+- name: status service
+  become: true
+  command: /etc/init.d/keycloak status
+  register: keycloak
+  poll: 5
+  async: 10
+
+- name: stop service
+  become: true
+  command: /etc/init.d/keycloak stop && Pkill keycloak
+  when: "keycloak.stdout.find('running') != -1"
+  poll: 5
+  async: 10
+  ignore_errors: true
+
+- name: start service
+  become: true
+  command: /etc/init.d/keycloak start
+  poll: 5
+  async: 5
+
+- name: Waiting Until Keycloak is fully functional
+  wait_for:
+    host: "{{ inventory_hostname }}"
+    port: 8080
+    delay: 5
+
+- name: Install dependencies for keycloak
+  apt:
+    name: "{{ item }}"
+    update_cache: true
+  with_items:
+    - python-pip
+    - python-setuptools
+
+- name: Copying python libraries
+  copy:
+    src: "{{ role_path }}/files/python-keycloak-0.12.0"
+    dest: /tmp/
+
+- name: Initialize python library to run keycloak bootstrap script
+  shell: cd /tmp/python-keycloak-0.12.0 && python setup.py install
+
+- name: Save keycalok vars to json
+  template:
+    src: "keycloak-bootstrap.conf.j2"
+    dest: "/tmp/keycloak-bootstrap.conf.json"
+    mode: "0644"
+
+- name: Copy realm json file to tmp location
+  template:
+    src: "keycloak-realm.j2"
+    dest: "/tmp/keycloak-realm.json"
+    mode: "0644"
+
+- name: Copy user manager roles file to tmp location
+  copy:
+    src: "files/python-keycloak-0.12.0/roles.json"
+    dest: "/tmp/roles.json"
+    mode: "0644"
+
+- name: Pausing for 60 seconds sometime for keycloak to run completely
+  pause:
+    seconds: 60
+
+- name: Copy the keycloak bootstrap script
+  copy:
+    src: "{{ role_path }}/files/python-keycloak-0.12.0/keycloak"
+    dest: /tmp
+
+- name: Run the keycloak bootstrap script
+  shell: cd /tmp/keycloak/ && python keycloak_main.py /tmp/keycloak-bootstrap.conf.json
+  register: out
+  until: '"404" not in out.stderr'
+  retries: 2
+  delay: 10
diff --git a/ansible/roles/keycloak-deploy-6.0/tasks/custom.yml b/ansible/roles/keycloak-deploy-6.0/tasks/custom.yml
new file mode 100644
index 000000000..d7c25d63e
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/tasks/custom.yml
@@ -0,0 +1,62 @@
+---
+- name: Install dependencies for keycloak
+  apt:
+    name: "{{ item }}"
+    update_cache: true
+  with_items:
+    - python-pip
+    - python-setuptools
+  run_once: true
+
+- name: Copying python libraries
+  copy:
+    src: '{{ role_path }}/files/python-keycloak-0.12.0'
+    dest: /tmp/
+  run_once: true
+
+- name: Initialize python library to run keycloak paython script
+  shell: cd /tmp/python-keycloak-0.12.0 && python setup.py install
+  run_once: true
+
+- name: Save keycloak vars to json
+  template:
+    src: "keycloak-bootstrap.conf.j2"
+    dest: "/tmp/keycloak-bootstrap.conf.json"
+    mode: "0644"
+  run_once: true
+
+- name: Copy realm json file to tmp location
+  template:
+    src: "keycloak-realm.j2"
+    dest: "/tmp/keycloak-realm.json"
+    mode: "0644"
+  run_once: true
+
+- name: Copy clients file to tmp location
+  template:
+    src: "clients.j2"
+    dest: "/tmp/clients.json"
+    mode: "0644"
+  run_once: true
+
+- name: Copy user manager roles file to tmp location
+  copy:
+    src: "files/python-keycloak-0.12.0/roles.json"
+    dest: "/tmp/roles.json"
+    mode: "0644"
+  run_once: true
+
+- name: Copy the keycloak paython script
+  copy:
+    src: "{{ role_path }}/files/python-keycloak-0.12.0/keycloak"
+    dest: /tmp
+  run_once: true
+
+- name: Run the keycloak paython script to import clients if not exist
+  shell: cd /tmp/keycloak/ && python keycloak_patch.py /tmp/keycloak-bootstrap.conf.json
+  register: out
+  until: '"404" not in out.stderr'
+  retries: 2
+  delay: 10
+  run_once: true
+  ignore_errors: true
diff --git a/ansible/roles/keycloak-deploy-6.0/tasks/deploy.yml b/ansible/roles/keycloak-deploy-6.0/tasks/deploy.yml
new file mode 100644
index 000000000..a796e2ad1
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/tasks/deploy.yml
@@ -0,0 +1,205 @@
+- name: Get the list of all the services running in our OS
+  become: yes
+  service_facts:
+
+- name: Stop the monit to ensure that it doesn't start keycloak
+  service: name=monit state=stopped
+  become: yes
+  when: ansible_facts.services.monit is defined
+
+- name: Status service
+  become: true
+  command: /etc/init.d/keycloak status
+  register: keycloak
+  poll: 5
+  async: 10
+
+- name: Stop service
+  become: true
+  command: /etc/init.d/keycloak stop && Pkill keycloak
+  when: "keycloak.stdout.find('running') != -1"
+  poll: 5
+  async: 10
+  ignore_errors: true
+
+- name: Adding ENV Vars to bashrc
+  lineinfile:
+    path: '/etc/environment'
+    line: '{{item.var}}={{item.value}}'
+    regexp: "{{ item.var }}.*"
+  with_items:
+    - {var: 'sunbird_lms_base_url', value: '{{ sunbird_lms_base_url }}'}
+    - {var: 'sunbird_authorization', value: '{{ sunbird_authorization }}'}
+    - {var: 'sunbird_encryption_key', value: '{{ sunbird_encryption_key }}'}
+    - {var: 'sunbird_sso_username', value: '{{ sunbird_sso_username }}'}
+    - {var: 'sunbird_sso_password', value: '{{ sunbird_sso_password }}'}
+    - {var: 'sunbird_sso_url', value: '{{ keycloak_auth_server_url }}/'}
+    - {var: 'sunbird_sso_realm', value: '{{ keycloak_realm }}'}
+    - {var: 'sunbird_sso_client_id', value: '{{ sunbird_sso_client_id }}'}
+    - {var: 'sunbird_cassandra_host', value: '{{ sunbird_cassandra_host }}'}
+    - {var: 'sunbird_user_service_base_url', value: '{{ sunbird_user_service_base_url }}'}
+
+- name: Remove keycloak
+  become: true
+  file:
+    path: "{{ keycloak_home }}"
+    state: absent
+    owner: "{{ wildfly_user }}"
+    group: "{{ wildfly_group }}"
+    force: true
+
+- name: Creating keycloak directory
+  become: true
+  file:
+    path: "{{ keycloak_home }}"
+    state: directory
+    owner: "{{ wildfly_user }}"
+    group: "{{ wildfly_group }}"
+
+- name: Extarct the folder
+  unarchive:
+    src: "{{ artifact_path }}"
+    dest: "{{ keycloak_home }}"
+    owner: "{{ wildfly_user }}"
+    group: "{{ wildfly_group }}"
+
+- name: Creating keycloak directory in proper structure
+  become: yes
+  shell: "cd {{ keycloak_home }} ; mv sunbird_auth_1.0v/* ./ ; rm -rf sunbird_auth_1.0v; chown -R keycloak:keycloak {{ keycloak_home }}"
+
+- name: Create required directories
+  file:
+    path: "{{ item.dest }}"
+    mode: "{{ item.mode }}"
+    state: directory
+  with_items:
+  - {dest: '{{ keycloak_home }}/providers', mode: '0755'}
+  - {dest: '{{ keycloak_home }}/modules/system/layers/keycloak/org/postgresql/main', mode: '0755'}
+  - {dest: '{{ keycloak_home }}/themes/{{ tenant_name }}/login/messages', mode: '0755'}
+  - {dest: '{{ keycloak_home }}/themes/{{ tenant_name }}/login/resources/css/fonts/notosans', mode: '0755'}
+  - {dest: '{{ keycloak_home }}/themes/{{ tenant_name }}/login/resources/css/themes/default/assets/fonts', mode: '0755'}
+  - {dest: '{{ keycloak_home }}/themes/{{ tenant_name }}/login/resources/img', mode: '0755'}
+  - {dest: '{{ keycloak_home }}/themes/{{ tenant_name }}/login/resources/js', mode: '0755'}
+  - {dest: '{{ keycloak_home }}/themes/{{ tenant_name }}/email/html', mode: '0755'}
+  - {dest: '{{ keycloak_home }}/themes/{{ tenant_name }}/email/messages', mode: '0755'}
+  - {dest: '{{ keycloak_home }}/themes/{{ tenant_name }}/email/text', mode: '0755'}
+
+- name: Copy login theme
+  copy:
+    src: "{{ login_theme }}/"
+    dest: "{{ keycloak_home }}/themes/{{ tenant_name }}/login/"
+    force: "yes"
+
+- name: Copy Custom Validation theme html to login theme
+  copy:
+    src: "../../../sunbird-auth/keycloak/sms-provider/templates/"
+    dest: "{{ keycloak_home }}/themes/{{ tenant_name }}/login/"
+    force: true
+
+- name: Copy email theme
+  copy:
+    src: "{{ email_theme }}/"
+    dest: "{{ keycloak_home }}/themes/{{ tenant_name }}/email/"
+    force: true
+
+- name: Create directory for sunbird auth package config
+  file:
+    path: sunbird_auth_{{ sunbird_auth_version }}.config
+    state: directory
+    mode: 0755
+    force: true
+
+- name: Keycloak configuration XML file - Multi-node keycloak
+  template:
+    src: "standalone-ha.xml"
+    dest: "sunbird_auth_{{ sunbird_auth_version }}.config/standalone-ha.xml"
+    mode: 0750
+  when: groups['keycloak'] | length > 1
+
+- name: Keycloak configuration XML file - Single node keycloak
+  template:
+    src: "standalone-ha-single.xml"
+    dest: "sunbird_auth_{{ sunbird_auth_version }}.config/standalone-ha.xml"
+    mode: 0750
+  when: groups['keycloak'] | length < 2
+
+- name: Postgresql Configuration- module.xml
+  template:
+    src: "roles/keycloak-deploy/templates/module.xml.j2"
+    dest: "sunbird_auth_{{ sunbird_auth_version }}.config/module.xml"
+    mode: 0750
+
+- name: SMS provider configuration file
+  template:
+    src: "roles/keycloak-deploy/templates/Msg91Creds.json.j2"
+    dest: "sunbird_auth_{{ sunbird_auth_version }}.config/Msg91Creds.json"
+    mode: 0755
+  when: "{{ msg_91_required|default(false) }}"
+  ignore_errors: true
+
+- name: Keycloak configuration XML file 
+  copy:
+    src: "sunbird_auth_{{ sunbird_auth_version }}.config/standalone-ha.xml"
+    dest: "{{ keycloak_home }}/standalone/configuration/standalone-ha.xml"
+    mode: 0750
+    owner: "{{ wildfly_user }}"
+    group: "{{ wildfly_group }}"
+    remote_src: true
+
+- name: Postgresql Configuration- module.xml
+  copy:
+    src: "sunbird_auth_{{ sunbird_auth_version }}.config/module.xml"
+    dest: "{{ keycloak_home }}/modules/system/layers/keycloak/org/postgresql/main/module.xml"
+    mode: 0750
+    owner: "{{ wildfly_user }}"
+    group: "{{ wildfly_group }}"
+    remote_src: true
+
+- name: Create a directory for SMS provider configuration
+  file:
+    path: "{{ keycloak_home }}/bin/sms-provider"
+    state: directory
+    mode: 0755
+  when: "{{ msg_91_required|default(false) }}"
+  ignore_errors: true
+
+- name: SMS provider configuration file
+  copy:
+    src: "sunbird_auth_{{ sunbird_auth_version }}.config/Msg91Creds.json"
+    dest: "{{ keycloak_home }}/bin/sms-provider/Msg91Creds.json"
+    owner: "{{ wildfly_user }}"
+    group: "{{ wildfly_group }}"
+    mode: 0755
+    remote_src: true
+  when: "{{ msg_91_required|default(false) }}"
+  ignore_errors: true
+
+- name: Remove the sunbird_auth_{{ sunbird_auth_version }}.config
+  become: true
+  file:
+    path: ./sunbird_auth_{{ sunbird_auth_version }}.config
+    state: absent
+    force: true
+
+- name: Overriding JAVA_HOME
+  become: true
+  lineinfile:
+    regexp: '^SERVER_OPTS=""'
+    insertafter: '^SERVER_OPTS=""'
+    line: 'JAVA_HOME=""'
+    path: "{{ keycloak_home }}/bin/standalone.sh"
+
+- name: Start service
+  become: true
+  command: /etc/init.d/keycloak start
+  poll: 5
+  async: 5
+
+- name: get the list of all services in the system
+  become: yes
+  service_facts:
+
+- name: After succesful migration and staring of keycloak, start back monit if installed
+  service: name=monit state=started
+  become: yes
+  when: ansible_facts.services.monit is defined
diff --git a/ansible/roles/keycloak-deploy-6.0/tasks/main.yml b/ansible/roles/keycloak-deploy-6.0/tasks/main.yml
new file mode 100644
index 000000000..e0b3ae699
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/tasks/main.yml
@@ -0,0 +1,13 @@
+---
+- include: bootstrap.yml
+  tags:
+      - bootstrap
+
+- include: deploy.yml
+  tags:
+      - deploy
+
+- include: custom.yml
+  tags:
+      - custom
+
diff --git a/ansible/roles/keycloak-deploy-6.0/templates/Msg91Creds.json.j2 b/ansible/roles/keycloak-deploy-6.0/templates/Msg91Creds.json.j2
new file mode 100644
index 000000000..d584b8be7
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/templates/Msg91Creds.json.j2
@@ -0,0 +1,7 @@
+{
+  "auth_key": "{{vault_auth_key}}",
+  "sender": "{{vault_sender}}",
+  "country": "{{vault_country}}",
+  "route": "{{vault_route}}",
+  "sms_method_type": "{{vault_sms_method_type}}"
+}
diff --git a/ansible/roles/keycloak-deploy-6.0/templates/clients.j2 b/ansible/roles/keycloak-deploy-6.0/templates/clients.j2
new file mode 100644
index 000000000..c34437cf6
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/templates/clients.j2
@@ -0,0 +1,262 @@
+{
+    "clients": [
+        {
+            "clientId": "google-auth-android",
+            "rootUrl": "{{proto}}://{{proxy_server_name}}",
+            "adminUrl": "",
+            "baseUrl": "/",
+            "surrogateAuthRequired": false,
+            "enabled": true,
+            "clientAuthenticatorType": "client-secret",
+            "redirectUris": [
+                "{{proto}}://{{proxy_server_name}}/*"
+            ],
+            "webOrigins": [],
+            "notBefore": 0,
+            "bearerOnly": false,
+            "consentRequired": false,
+            "standardFlowEnabled": false,
+            "implicitFlowEnabled": false,
+            "directAccessGrantsEnabled": true,
+            "serviceAccountsEnabled": false,
+            "publicClient": false,
+            "frontchannelLogout": false,
+            "protocol": "openid-connect",
+            "attributes": {
+                "saml.assertion.signature": "false",
+                "saml.force.post.binding": "false",
+                "saml.multivalued.roles": "false",
+                "saml.encrypt": "false",
+                "saml_force_name_id_format": "false",
+                "saml.client.signature": "false",
+                "saml.authnstatement": "false",
+                "saml.server.signature": "false",
+                "saml.server.signature.keyinfo.ext": "false",
+                "saml.onetimeuse.condition": "false"
+            },
+            "fullScopeAllowed": true,
+            "nodeReRegistrationTimeout": -1,
+            "protocolMappers": [
+                {
+                    "name": "full name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-full-name-mapper",
+                    "consentRequired": true,
+                    "consentText": "${fullName}",
+                    "config": {
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "userinfo.token.claim": "true"
+                    }
+                },
+                {
+                    "name": "username",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${username}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "username",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "preferred_username",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "family name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${familyName}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "lastName",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "family_name",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "role list",
+                    "protocol": "saml",
+                    "protocolMapper": "saml-role-list-mapper",
+                    "consentRequired": false,
+                    "config": {
+                        "single": "false",
+                        "attribute.nameformat": "Basic",
+                        "attribute.name": "Role"
+                    }
+                },
+                {
+                    "name": "given name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${givenName}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "firstName",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "given_name",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "email",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${email}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "email",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "email",
+                        "jsonType.label": "String"
+                    }
+                }
+            ],
+            "useTemplateConfig": false,
+            "useTemplateScope": false,
+            "useTemplateMappers": false,
+            "access": {
+                "view": true,
+                "configure": true,
+                "manage": true
+            }
+        },
+        {
+            "clientId": "trampoline-android",
+            "rootUrl": "{{proto}}://{{proxy_server_name}}",
+            "adminUrl": "",
+            "baseUrl": "/",
+            "surrogateAuthRequired": false,
+            "enabled": true,
+            "clientAuthenticatorType": "client-secret",
+            "redirectUris": [],
+            "webOrigins": [],
+            "notBefore": 0,
+            "bearerOnly": false,
+            "consentRequired": false,
+            "standardFlowEnabled": false,
+            "implicitFlowEnabled": false,
+            "directAccessGrantsEnabled": true,
+            "serviceAccountsEnabled": false,
+            "publicClient": false,
+            "frontchannelLogout": false,
+            "protocol": "openid-connect",
+            "attributes": {
+                "saml.assertion.signature": "false",
+                "saml.force.post.binding": "false",
+                "saml.multivalued.roles": "false",
+                "saml.encrypt": "false",
+                "saml_force_name_id_format": "false",
+                "saml.client.signature": "false",
+                "saml.authnstatement": "false",
+                "saml.server.signature": "false",
+                "saml.server.signature.keyinfo.ext": "false",
+                "saml.onetimeuse.condition": "false"
+            },
+            "fullScopeAllowed": true,
+            "nodeReRegistrationTimeout": -1,
+            "protocolMappers": [
+                {
+                    "name": "role list",
+                    "protocol": "saml",
+                    "protocolMapper": "saml-role-list-mapper",
+                    "consentRequired": false,
+                    "config": {
+                        "single": "false",
+                        "attribute.nameformat": "Basic",
+                        "attribute.name": "Role"
+                    }
+                },
+                {
+                    "name": "family name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${familyName}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "lastName",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "family_name",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "full name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-full-name-mapper",
+                    "consentRequired": true,
+                    "consentText": "${fullName}",
+                    "config": {
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "userinfo.token.claim": "true"
+                    }
+                },
+                {
+                    "name": "username",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${username}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "username",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "preferred_username",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "email",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${email}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "email",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "email",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "given name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${givenName}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "firstName",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "given_name",
+                        "jsonType.label": "String"
+                    }
+                }
+            ],
+            "useTemplateConfig": false,
+            "useTemplateScope": false,
+            "useTemplateMappers": false,
+            "access": {
+                "view": true,
+                "configure": true,
+                "manage": true
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/ansible/roles/keycloak-deploy-6.0/templates/clients.json b/ansible/roles/keycloak-deploy-6.0/templates/clients.json
new file mode 100644
index 000000000..c34437cf6
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/templates/clients.json
@@ -0,0 +1,262 @@
+{
+    "clients": [
+        {
+            "clientId": "google-auth-android",
+            "rootUrl": "{{proto}}://{{proxy_server_name}}",
+            "adminUrl": "",
+            "baseUrl": "/",
+            "surrogateAuthRequired": false,
+            "enabled": true,
+            "clientAuthenticatorType": "client-secret",
+            "redirectUris": [
+                "{{proto}}://{{proxy_server_name}}/*"
+            ],
+            "webOrigins": [],
+            "notBefore": 0,
+            "bearerOnly": false,
+            "consentRequired": false,
+            "standardFlowEnabled": false,
+            "implicitFlowEnabled": false,
+            "directAccessGrantsEnabled": true,
+            "serviceAccountsEnabled": false,
+            "publicClient": false,
+            "frontchannelLogout": false,
+            "protocol": "openid-connect",
+            "attributes": {
+                "saml.assertion.signature": "false",
+                "saml.force.post.binding": "false",
+                "saml.multivalued.roles": "false",
+                "saml.encrypt": "false",
+                "saml_force_name_id_format": "false",
+                "saml.client.signature": "false",
+                "saml.authnstatement": "false",
+                "saml.server.signature": "false",
+                "saml.server.signature.keyinfo.ext": "false",
+                "saml.onetimeuse.condition": "false"
+            },
+            "fullScopeAllowed": true,
+            "nodeReRegistrationTimeout": -1,
+            "protocolMappers": [
+                {
+                    "name": "full name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-full-name-mapper",
+                    "consentRequired": true,
+                    "consentText": "${fullName}",
+                    "config": {
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "userinfo.token.claim": "true"
+                    }
+                },
+                {
+                    "name": "username",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${username}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "username",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "preferred_username",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "family name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${familyName}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "lastName",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "family_name",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "role list",
+                    "protocol": "saml",
+                    "protocolMapper": "saml-role-list-mapper",
+                    "consentRequired": false,
+                    "config": {
+                        "single": "false",
+                        "attribute.nameformat": "Basic",
+                        "attribute.name": "Role"
+                    }
+                },
+                {
+                    "name": "given name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${givenName}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "firstName",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "given_name",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "email",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${email}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "email",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "email",
+                        "jsonType.label": "String"
+                    }
+                }
+            ],
+            "useTemplateConfig": false,
+            "useTemplateScope": false,
+            "useTemplateMappers": false,
+            "access": {
+                "view": true,
+                "configure": true,
+                "manage": true
+            }
+        },
+        {
+            "clientId": "trampoline-android",
+            "rootUrl": "{{proto}}://{{proxy_server_name}}",
+            "adminUrl": "",
+            "baseUrl": "/",
+            "surrogateAuthRequired": false,
+            "enabled": true,
+            "clientAuthenticatorType": "client-secret",
+            "redirectUris": [],
+            "webOrigins": [],
+            "notBefore": 0,
+            "bearerOnly": false,
+            "consentRequired": false,
+            "standardFlowEnabled": false,
+            "implicitFlowEnabled": false,
+            "directAccessGrantsEnabled": true,
+            "serviceAccountsEnabled": false,
+            "publicClient": false,
+            "frontchannelLogout": false,
+            "protocol": "openid-connect",
+            "attributes": {
+                "saml.assertion.signature": "false",
+                "saml.force.post.binding": "false",
+                "saml.multivalued.roles": "false",
+                "saml.encrypt": "false",
+                "saml_force_name_id_format": "false",
+                "saml.client.signature": "false",
+                "saml.authnstatement": "false",
+                "saml.server.signature": "false",
+                "saml.server.signature.keyinfo.ext": "false",
+                "saml.onetimeuse.condition": "false"
+            },
+            "fullScopeAllowed": true,
+            "nodeReRegistrationTimeout": -1,
+            "protocolMappers": [
+                {
+                    "name": "role list",
+                    "protocol": "saml",
+                    "protocolMapper": "saml-role-list-mapper",
+                    "consentRequired": false,
+                    "config": {
+                        "single": "false",
+                        "attribute.nameformat": "Basic",
+                        "attribute.name": "Role"
+                    }
+                },
+                {
+                    "name": "family name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${familyName}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "lastName",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "family_name",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "full name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-full-name-mapper",
+                    "consentRequired": true,
+                    "consentText": "${fullName}",
+                    "config": {
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "userinfo.token.claim": "true"
+                    }
+                },
+                {
+                    "name": "username",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${username}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "username",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "preferred_username",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "email",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${email}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "email",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "email",
+                        "jsonType.label": "String"
+                    }
+                },
+                {
+                    "name": "given name",
+                    "protocol": "openid-connect",
+                    "protocolMapper": "oidc-usermodel-property-mapper",
+                    "consentRequired": true,
+                    "consentText": "${givenName}",
+                    "config": {
+                        "userinfo.token.claim": "true",
+                        "user.attribute": "firstName",
+                        "id.token.claim": "true",
+                        "access.token.claim": "true",
+                        "claim.name": "given_name",
+                        "jsonType.label": "String"
+                    }
+                }
+            ],
+            "useTemplateConfig": false,
+            "useTemplateScope": false,
+            "useTemplateMappers": false,
+            "access": {
+                "view": true,
+                "configure": true,
+                "manage": true
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/ansible/roles/keycloak-deploy-6.0/templates/keycloak-bootstrap.conf.j2 b/ansible/roles/keycloak-deploy-6.0/templates/keycloak-bootstrap.conf.j2
new file mode 100644
index 000000000..71551589f
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/templates/keycloak-bootstrap.conf.j2
@@ -0,0 +1,14 @@
+{
+    "keycloak_auth_server_url": "http://localhost:8080/auth/",
+    "keycloak_management_user": "{{ keycloak_management_user }}",
+    "keycloak_management_password": "{{ keycloak_management_password }}",
+    "keycloak_realm": "{{ keycloak_realm }}",
+    "keycloak_realm_json_file_path": "/tmp/keycloak-realm.json",
+    "keycloak_user_manager_roles_json_file_path": "/tmp/roles.json",
+    "keycloak_api_management_username":  "{{ keycloak_api_management_username }}",
+    "keycloak_api_management_user_email": "{{ keycloak_api_management_user_email }}",
+    "keycloak_api_management_user_first_name": "{{ keycloak_api_management_user_first_name }}",
+    "keycloak_api_management_user_last_name": "{{ keycloak_api_management_user_last_name }}",
+    "keycloak_api_management_user_password": "{{ keycloak_api_management_user_password }}",
+    "keycloak_clients": "/tmp/clients.json"
+}
diff --git a/ansible/roles/keycloak-deploy-6.0/templates/keycloak-realm.j2 b/ansible/roles/keycloak-deploy-6.0/templates/keycloak-realm.j2
new file mode 100644
index 000000000..7ce7e8820
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/templates/keycloak-realm.j2
@@ -0,0 +1,2648 @@
+{
+  "id": "sunbird",
+  "realm": "sunbird",
+  "notBefore": 1548955037,
+  "revokeRefreshToken": false,
+  "accessTokenLifespan": 86400,
+  "accessTokenLifespanForImplicitFlow": 5184000,
+  "ssoSessionIdleTimeout": 86400,
+  "ssoSessionMaxLifespan": 86400,
+  "offlineSessionIdleTimeout": 15552000,
+  "accessCodeLifespan": 60,
+  "accessCodeLifespanUserAction": 300,
+  "accessCodeLifespanLogin": 43200,
+  "actionTokenGeneratedByAdminLifespan": 43200,
+  "actionTokenGeneratedByUserLifespan": 300,
+  "enabled": true,
+  "sslRequired": {{ '"none"' if proto=='http' else '"external"' }},
+  "registrationAllowed": true,
+  "registrationEmailAsUsername": false,
+  "rememberMe": true,
+  "verifyEmail": false,
+  "loginWithEmailAllowed": true,
+  "duplicateEmailsAllowed": false,
+  "resetPasswordAllowed": true,
+  "editUsernameAllowed": false,
+  "bruteForceProtected": true,
+  "permanentLockout": false,
+  "maxFailureWaitSeconds": 900,
+  "minimumQuickLoginWaitSeconds": 60,
+  "waitIncrementSeconds": 60,
+  "quickLoginCheckMilliSeconds": 1000,
+  "maxDeltaTimeSeconds": 43200,
+  "failureFactor": 30,
+  "roles": {
+    "realm": [
+      {
+        "id": "7b955d7f-0a1e-4935-8391-642886d34612",
+        "name": "offline_access",
+        "description": "${role_offline-access}",
+        "scopeParamRequired": true,
+        "composite": false,
+        "clientRole": false,
+        "containerId": "sunbird"
+      },
+      {
+        "id": "d6e505fe-c3c5-4689-946e-7f69d3f64c6c",
+        "name": "admin",
+        "description": "role_admin",
+        "scopeParamRequired": false,
+        "composite": true,
+        "composites": {
+          "realm": [
+            "offline_access",
+            "uma_authorization"
+          ]
+        },
+        "clientRole": false,
+        "containerId": "sunbird"
+      },
+      {
+        "id": "96adf368-c8e2-4b39-b2a5-2559573edb63",
+        "name": "uma_authorization",
+        "description": "${role_uma_authorization}",
+        "scopeParamRequired": false,
+        "composite": false,
+        "clientRole": false,
+        "containerId": "sunbird"
+      }
+    ],
+    "client": {
+      "realm-management": [
+        {
+          "id": "3f8bf7e5-5d66-4394-8f06-1270529c605f",
+          "name": "manage-authorization",
+          "description": "${role_manage-authorization}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "601fa2c9-29d4-49c1-87ac-939a1260f6ce",
+          "name": "query-realms",
+          "description": "${role_query-realms}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "9aa1dcd9-cb93-4496-af5f-41b9ecacc1da",
+          "name": "view-authorization",
+          "description": "${role_view-authorization}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "98999987-faf5-4c4e-958a-e5463bc4edc6",
+          "name": "manage-events",
+          "description": "${role_manage-events}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "f898fca8-5361-49d5-900a-ebf5b775a939",
+          "name": "impersonation",
+          "description": "${role_impersonation}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "698dfeb0-b8d2-4240-b8a8-acd4b7a12ad3",
+          "name": "view-realm",
+          "description": "${role_view-realm}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "3ff462fc-b33c-431a-b54b-861c3298d910",
+          "name": "manage-users",
+          "description": "${role_manage-users}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "be1802b1-558c-404c-bcb9-b9bf77af9788",
+          "name": "manage-identity-providers",
+          "description": "${role_manage-identity-providers}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "387b44e4-e901-4431-b9af-6abd9377ed46",
+          "name": "query-clients",
+          "description": "${role_query-clients}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "a408b6e8-03c9-46a2-97ba-305d09db0c3c",
+          "name": "view-events",
+          "description": "${role_view-events}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "41c2f39a-3008-4f9d-9e1e-a7738c118570",
+          "name": "query-groups",
+          "description": "${role_query-groups}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "26d3289b-d2eb-4cf2-a501-f1e3fa07344c",
+          "name": "manage-clients",
+          "description": "${role_manage-clients}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "e2077ab0-6efb-450d-9cba-89cacd887b71",
+          "name": "create-client",
+          "description": "${role_create-client}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "46019462-3dc8-46a8-9786-ffcbad293f43",
+          "name": "view-users",
+          "description": "${role_view-users}",
+          "scopeParamRequired": false,
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "query-groups",
+                "query-users"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "d269f220-e93f-4b43-96a1-9f2c117a2dfb",
+          "name": "view-clients",
+          "description": "${role_view-clients}",
+          "scopeParamRequired": false,
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "query-clients"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "0c998f1b-7363-47fb-a493-4b6f4aacb0ba",
+          "name": "realm-admin",
+          "description": "${role_realm-admin}",
+          "scopeParamRequired": false,
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "manage-authorization",
+                "query-realms",
+                "view-authorization",
+                "manage-events",
+                "impersonation",
+                "view-realm",
+                "manage-users",
+                "manage-identity-providers",
+                "query-clients",
+                "view-events",
+                "query-groups",
+                "manage-clients",
+                "create-client",
+                "view-users",
+                "view-clients",
+                "manage-realm",
+                "view-identity-providers",
+                "query-users"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "d77bf5a5-5877-450b-b11e-5f874f410e10",
+          "name": "manage-realm",
+          "description": "${role_manage-realm}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "d97009ed-d0c7-4afb-b9a3-6ee03ef01a74",
+          "name": "view-identity-providers",
+          "description": "${role_view-identity-providers}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        },
+        {
+          "id": "57118202-c5e5-4c49-829b-c2ed796bfdea",
+          "name": "query-users",
+          "description": "${role_query-users}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "b2f45201-1362-4b10-83c3-207d470f44bf"
+        }
+      ],
+      "security-admin-console": [],
+      "android": [],
+      "admin-cli": [
+        {
+          "id": "30ab6b4f-b17c-4fff-a5fa-1181686bb409",
+          "name": "admin",
+          "description": "admin role",
+          "scopeParamRequired": false,
+          "composite": true,
+          "composites": {
+            "realm": [
+              "offline_access",
+              "admin",
+              "uma_authorization"
+            ]
+          },
+          "clientRole": true,
+          "containerId": "8891d8e9-35e6-4a1c-b32b-027be03b0f24"
+        }
+      ],
+      "trampoline": [],
+      "broker": [
+        {
+          "id": "19ef58ac-2d90-40a4-a158-0e2f8893264a",
+          "name": "read-token",
+          "description": "${role_read-token}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "c3950efa-6684-44c2-b50a-c7b3d16df04b"
+        }
+      ],
+      "portal": [],
+      "account": [
+        {
+          "id": "1fef7ac5-b042-462b-8298-0446044788b3",
+          "name": "manage-account",
+          "description": "${role_manage-account}",
+          "scopeParamRequired": false,
+          "composite": true,
+          "composites": {
+            "client": {
+              "account": [
+                "manage-account-links"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "c2d24d3f-65ca-46de-9cd8-3eeb71a7f83d"
+        },
+        {
+          "id": "f8786348-6fa4-4b13-828e-9f080c9c6824",
+          "name": "manage-account-links",
+          "description": "${role_manage-account-links}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "c2d24d3f-65ca-46de-9cd8-3eeb71a7f83d"
+        },
+        {
+          "id": "91c5c738-9c39-4c4d-bae8-75f18fd7c5e4",
+          "name": "view-profile",
+          "description": "${role_view-profile}",
+          "scopeParamRequired": false,
+          "composite": false,
+          "clientRole": true,
+          "containerId": "c2d24d3f-65ca-46de-9cd8-3eeb71a7f83d"
+        }
+      ],
+      "google-auth": [],
+      "google-auth-android": [],
+      "trampoline-android": []
+    }
+  },
+  "groups": [],
+  "defaultRoles": [
+    "offline_access",
+    "uma_authorization"
+  ],
+  "requiredCredentials": [
+    "password"
+  ],
+  "passwordPolicy": "hashIterations(20000)",
+  "otpPolicyType": "totp",
+  "otpPolicyAlgorithm": "HmacSHA1",
+  "otpPolicyInitialCounter": 0,
+  "otpPolicyDigits": 6,
+  "otpPolicyLookAheadWindow": 1,
+  "otpPolicyPeriod": 120,
+  "clientScopeMappings": {
+    "realm-management": [
+      {
+        "client": "admin-cli",
+        "roles": [
+          "realm-admin"
+        ]
+      },
+      {
+        "client": "security-admin-console",
+        "roles": [
+          "realm-admin"
+        ]
+      }
+    ]
+  },
+  "clients": [
+    {
+      "id": "9a901d18-377b-4615-9b89-677b544be3c5",
+      "clientId": "trampoline",
+      "rootUrl": "{{proto}}://{{proxy_server_name}}",
+      "adminUrl": "",
+      "baseUrl": "/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "{{sunbird_trampoline_secret}}",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": false,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "saml.authnstatement": "false",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "protocolMappers": [
+        {
+          "id": "12134027-94cc-401c-bbf6-be565078ddfb",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "6a956bf1-6c40-4549-b335-9fe8c788b18f",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "d32ba1d4-3fef-42ff-aa2b-98cb4bfef6f9",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "9e899fc7-1ddd-447d-810c-d91333d6621c",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "74e4d13f-bd02-4f17-bbbc-d4b79bab1971",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "48fe23c2-a6fb-4c5e-8930-28ad1913829a",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "da893beb-6ac7-420d-b51b-f05dadf56bbc",
+      "clientId": "android",
+      "rootUrl": "{{proto}}://{{proxy_server_name}}",
+      "baseUrl": "/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": ["{{proto}}://{{proxy_server_name}}/oauth2callback"],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "saml.authnstatement": "false",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "protocolMappers": [
+        {
+          "id": "ff7dac46-16b4-4ab6-a054-dd03d5411fa9",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "32fad9c0-0dfe-45b2-94a1-3e2f74d756ec",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "4fb4d644-c609-4a27-a407-d451bcd83e16",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "84e7c6e5-1afb-44d8-b507-1ed31fa0f351",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "e7ca189f-94de-4996-a192-e93ba960bbba",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "16bedb3b-7571-4106-9a47-66151915ac31",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "647aa742-d849-41d2-b174-c06b59e6d5b6",
+      "clientId": "google-auth",
+      "rootUrl": "{{proto}}://{{proxy_server_name}}",
+      "adminUrl": "",
+      "baseUrl": "/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": ["{{proto}}://{{proxy_server_name}}/private/*"],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": false,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "saml.authnstatement": "false",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "protocolMappers": [
+        {
+          "id": "4b3632c9-8055-4f9f-9702-3c975d93bf8d",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "bdb4cdf5-0ee5-475b-bb47-25a5f90f1305",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "702df96e-686f-4b68-bafd-1cb820fff7fb",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "03617f2e-6b45-4844-a81c-0df09ea89988",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "b38527eb-dbed-4868-8075-69038ee3072a",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "93b57ddf-9f32-4c0e-95eb-258ad19693db",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "8891d8e9-35e6-4a1c-b32b-027be03b0f24",
+      "clientId": "admin-cli",
+      "name": "${client_admin-cli}",
+      "rootUrl": "{{proto}}://{{proxy_server_name}}",
+      "adminUrl": "{{proto}}://{{proxy_server_name}}/*",
+      "baseUrl": "/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [
+        "{{proto}}://{{proxy_server_name}}/*",
+        "{{proto}}://{{proxy_server_name}}/"
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": false,
+      "implicitFlowEnabled": true,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "saml.authnstatement": "false",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "32d6a3a4-8635-4a36-bd14-8ac5b73a49cc",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "900fa741-d1b2-467e-88a6-b454a9519568",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "8ea14714-d160-49b8-b612-59102d50ef53",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "bd167b99-5d23-49c1-90c7-85c2b088fed7",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "c4fe56a1-8d15-455a-b87b-cf051454b57c",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "26e3bf4c-8f9a-4548-b0db-5bbb7c398991",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "c3950efa-6684-44c2-b50a-c7b3d16df04b",
+      "clientId": "broker",
+      "name": "${client_broker}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "54c3bbc3-850b-4636-82d1-ed4f3a46a00a",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "0f0d9b74-c476-4981-a783-dd4bdbe041ec",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "d6f625cc-eac1-49d0-bea5-17e6f9d3860c",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "bbf35056-9bbe-49a0-aefc-2bde2379ccdc",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "38b04951-1043-4dc6-9504-7b0f31ed71a4",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "88bb836b-7feb-45eb-b004-fb3be8436908",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "b2f45201-1362-4b10-83c3-207d470f44bf",
+      "clientId": "realm-management",
+      "name": "${client_realm-management}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": true,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "authorizationServicesEnabled": true,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "71605238-bf41-400e-8c03-a5d78f54b00b",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "a0cb6f3a-30ef-4475-b73f-ca6c2f1f3675",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "3a7708b1-63b9-4116-af7f-969fc1bf61a4",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "c393d7b7-fa22-4e90-9ad7-07d520632c20",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "e77aae69-8ea4-4ee4-bcd6-ba7ef3958c02",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "2d8cbac4-e4dd-4fa6-bf71-98adf826b9dd",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false,
+      "authorizationSettings": {
+        "allowRemoteResourceManagement": false,
+        "policyEnforcementMode": "ENFORCING",
+        "resources": [
+          {
+            "name": "role.resource.30ab6b4f-b17c-4fff-a5fa-1181686bb409",
+            "type": "Role",
+            "scopes": [
+              {
+                "name": "map-role-composite"
+              },
+              {
+                "name": "map-role-client-scope"
+              },
+              {
+                "name": "map-role"
+              }
+            ],
+            "typedScopes": []
+          },
+          {
+            "name": "role.resource.d6e505fe-c3c5-4689-946e-7f69d3f64c6c",
+            "type": "Role",
+            "scopes": [
+              {
+                "name": "map-role-composite"
+              },
+              {
+                "name": "map-role-client-scope"
+              },
+              {
+                "name": "map-role"
+              }
+            ],
+            "typedScopes": []
+          }
+        ],
+        "policies": [
+          {
+            "name": "map-role-composite.permission.30ab6b4f-b17c-4fff-a5fa-1181686bb409",
+            "type": "scope",
+            "logic": "POSITIVE",
+            "decisionStrategy": "AFFIRMATIVE",
+            "config": {
+              "resources": "[\"role.resource.30ab6b4f-b17c-4fff-a5fa-1181686bb409\"]",
+              "scopes": "[\"map-role-composite\"]"
+            }
+          },
+          {
+            "name": "map-role-client-scope.permission.30ab6b4f-b17c-4fff-a5fa-1181686bb409",
+            "type": "scope",
+            "logic": "POSITIVE",
+            "decisionStrategy": "AFFIRMATIVE",
+            "config": {
+              "resources": "[\"role.resource.30ab6b4f-b17c-4fff-a5fa-1181686bb409\"]",
+              "scopes": "[\"map-role-client-scope\"]"
+            }
+          },
+          {
+            "name": "map-role.permission.30ab6b4f-b17c-4fff-a5fa-1181686bb409",
+            "type": "scope",
+            "logic": "POSITIVE",
+            "decisionStrategy": "AFFIRMATIVE",
+            "config": {
+              "resources": "[\"role.resource.30ab6b4f-b17c-4fff-a5fa-1181686bb409\"]",
+              "scopes": "[\"map-role\"]"
+            }
+          },
+          {
+            "name": "map-role-composite.permission.d6e505fe-c3c5-4689-946e-7f69d3f64c6c",
+            "type": "scope",
+            "logic": "POSITIVE",
+            "decisionStrategy": "AFFIRMATIVE",
+            "config": {
+              "resources": "[\"role.resource.d6e505fe-c3c5-4689-946e-7f69d3f64c6c\"]",
+              "scopes": "[\"map-role-composite\"]"
+            }
+          },
+          {
+            "name": "map-role-client-scope.permission.d6e505fe-c3c5-4689-946e-7f69d3f64c6c",
+            "type": "scope",
+            "logic": "POSITIVE",
+            "decisionStrategy": "AFFIRMATIVE",
+            "config": {
+              "resources": "[\"role.resource.d6e505fe-c3c5-4689-946e-7f69d3f64c6c\"]",
+              "scopes": "[\"map-role-client-scope\"]"
+            }
+          },
+          {
+            "name": "map-role.permission.d6e505fe-c3c5-4689-946e-7f69d3f64c6c",
+            "type": "scope",
+            "logic": "POSITIVE",
+            "decisionStrategy": "AFFIRMATIVE",
+            "config": {
+              "resources": "[\"role.resource.d6e505fe-c3c5-4689-946e-7f69d3f64c6c\"]",
+              "scopes": "[\"map-role\"]"
+            }
+          }
+        ],
+        "scopes": [
+          {
+            "name": "map-role-composite"
+          },
+          {
+            "name": "map-role-client-scope"
+          },
+          {
+            "name": "map-role"
+          }
+        ]
+      }
+    },
+    {
+      "id": "8c12290d-d62f-48ce-913b-c93bf995ca59",
+      "clientId": "portal",
+      "rootUrl": "{{proto}}://{{proxy_server_name}}",
+      "adminUrl": "/callback",
+      "baseUrl": "/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": ["{{proto}}://{{proxy_server_name}}/private/*", "{{proto}}://{{proxy_server_name}}/","{{proto}}://{{proxy_server_name}}/*"],
+      "webOrigins": [
+        ""
+      ],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "saml.authnstatement": "false",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "protocolMappers": [
+        {
+          "id": "63071ff2-a5e5-4d38-b534-a9f25a075403",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "9bf9cad5-dbce-41e9-aa36-d84cc5a768a2",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "238e55b7-6545-467e-856b-f95477afe1ff",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "edb1ff4e-b452-46bc-8c3b-d6075f6ee579",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "7a0118e2-57ff-4d23-bf74-cbfe1f545d1d",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "b59a913e-118a-4dc4-a8d7-66c44ced5345",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "79c518d7-b41a-4e6f-be42-4ef365824100",
+      "clientId": "security-admin-console",
+      "name": "${client_security-admin-console}",
+      "baseUrl": "/auth/admin/sunbird/console/index.html",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "redirectUris": [
+        "/auth/admin/sunbird/console/*"
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "c989a8c8-cb8b-40ff-b4b9-86122bad7aa9",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "b180fb8c-997c-4f6a-b774-af677f903139",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "c373dc9a-49d7-4d28-9b94-06cf20fb1955",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "24c7b1c4-62c2-4d92-ab19-49bfaedcc3d4",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "883a39a7-37b4-46ef-a761-3e51b95ccc35",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "95ed8e44-38cc-4f09-8adc-19c12d5eada0",
+          "name": "locale",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "consentText": "${locale}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "locale",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "locale",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "c66c6a41-eb22-443f-8a77-e68d404ad26f",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+      "id": "c2d24d3f-65ca-46de-9cd8-3eeb71a7f83d",
+      "clientId": "account",
+      "name": "${client_account}",
+      "baseUrl": "/auth/realms/sunbird/account",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "",
+      "defaultRoles": [
+        "manage-account",
+        "view-profile"
+      ],
+      "redirectUris": [
+        "/auth/realms/sunbird/account/*"
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "a64118ab-33c8-4060-9f3e-3ed817ba8e0d",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        },
+        {
+          "id": "1f4a0c5e-7c8a-4693-8be5-14681b243868",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${username}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "8d88a133-a399-4e75-b051-5b0d4ae850ab",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": true,
+          "consentText": "${fullName}",
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "45593258-916c-4158-8577-d9806c16415a",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${email}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "027be48e-b7dc-4c3a-a648-414a466b67dd",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${familyName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "c93937f9-0446-4be9-8b47-3c6de857497e",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": true,
+          "consentText": "${givenName}",
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "useTemplateConfig": false,
+      "useTemplateScope": false,
+      "useTemplateMappers": false
+    },
+    {
+        "clientId": "google-auth-android",
+        "rootUrl": "{{proto}}://{{proxy_server_name}}",
+        "adminUrl": "",
+        "baseUrl": "/",
+        "surrogateAuthRequired": false,
+        "enabled": true,
+        "clientAuthenticatorType": "client-secret",
+        "redirectUris": [
+            "{{proto}}://{{proxy_server_name}}/*"
+        ],
+        "webOrigins": [],
+        "notBefore": 0,
+        "bearerOnly": false,
+        "consentRequired": false,
+        "standardFlowEnabled": false,
+        "implicitFlowEnabled": false,
+        "directAccessGrantsEnabled": true,
+        "serviceAccountsEnabled": false,
+        "publicClient": false,
+        "frontchannelLogout": false,
+        "protocol": "openid-connect",
+        "attributes": {
+            "saml.assertion.signature": "false",
+            "saml.force.post.binding": "false",
+            "saml.multivalued.roles": "false",
+            "saml.encrypt": "false",
+            "saml_force_name_id_format": "false",
+            "saml.client.signature": "false",
+            "saml.authnstatement": "false",
+            "saml.server.signature": "false",
+            "saml.server.signature.keyinfo.ext": "false",
+            "saml.onetimeuse.condition": "false"
+        },
+        "fullScopeAllowed": true,
+        "nodeReRegistrationTimeout": -1,
+        "protocolMappers": [
+            {
+                "name": "full name",
+                "protocol": "openid-connect",
+                "protocolMapper": "oidc-full-name-mapper",
+                "consentRequired": true,
+                "consentText": "${fullName}",
+                "config": {
+                    "id.token.claim": "true",
+                    "access.token.claim": "true",
+                    "userinfo.token.claim": "true"
+                }
+            },
+            {
+                "name": "username",
+                "protocol": "openid-connect",
+                "protocolMapper": "oidc-usermodel-property-mapper",
+                "consentRequired": true,
+                "consentText": "${username}",
+                "config": {
+                    "userinfo.token.claim": "true",
+                    "user.attribute": "username",
+                    "id.token.claim": "true",
+                    "access.token.claim": "true",
+                    "claim.name": "preferred_username",
+                    "jsonType.label": "String"
+                }
+            },
+            {
+                "name": "family name",
+                "protocol": "openid-connect",
+                "protocolMapper": "oidc-usermodel-property-mapper",
+                "consentRequired": true,
+                "consentText": "${familyName}",
+                "config": {
+                    "userinfo.token.claim": "true",
+                    "user.attribute": "lastName",
+                    "id.token.claim": "true",
+                    "access.token.claim": "true",
+                    "claim.name": "family_name",
+                    "jsonType.label": "String"
+                }
+            },
+            {
+                "name": "role list",
+                "protocol": "saml",
+                "protocolMapper": "saml-role-list-mapper",
+                "consentRequired": false,
+                "config": {
+                    "single": "false",
+                    "attribute.nameformat": "Basic",
+                    "attribute.name": "Role"
+                }
+            },
+            {
+                "name": "given name",
+                "protocol": "openid-connect",
+                "protocolMapper": "oidc-usermodel-property-mapper",
+                "consentRequired": true,
+                "consentText": "${givenName}",
+                "config": {
+                    "userinfo.token.claim": "true",
+                    "user.attribute": "firstName",
+                    "id.token.claim": "true",
+                    "access.token.claim": "true",
+                    "claim.name": "given_name",
+                    "jsonType.label": "String"
+                }
+            },
+            {
+                "name": "email",
+                "protocol": "openid-connect",
+                "protocolMapper": "oidc-usermodel-property-mapper",
+                "consentRequired": true,
+                "consentText": "${email}",
+                "config": {
+                    "userinfo.token.claim": "true",
+                    "user.attribute": "email",
+                    "id.token.claim": "true",
+                    "access.token.claim": "true",
+                    "claim.name": "email",
+                    "jsonType.label": "String"
+                }
+            }
+        ],
+        "useTemplateConfig": false,
+        "useTemplateScope": false,
+        "useTemplateMappers": false,
+        "access": {
+            "view": true,
+            "configure": true,
+            "manage": true
+        }
+    },
+    {
+        "clientId": "trampoline-android",
+        "rootUrl": "{{proto}}://{{proxy_server_name}}",
+        "adminUrl": "",
+        "baseUrl": "/",
+        "surrogateAuthRequired": false,
+        "enabled": true,
+        "clientAuthenticatorType": "client-secret",
+        "redirectUris": [],
+        "webOrigins": [],
+        "notBefore": 0,
+        "bearerOnly": false,
+        "consentRequired": false,
+        "standardFlowEnabled": false,
+        "implicitFlowEnabled": false,
+        "directAccessGrantsEnabled": true,
+        "serviceAccountsEnabled": false,
+        "publicClient": false,
+        "frontchannelLogout": false,
+        "protocol": "openid-connect",
+        "attributes": {
+            "saml.assertion.signature": "false",
+            "saml.force.post.binding": "false",
+            "saml.multivalued.roles": "false",
+            "saml.encrypt": "false",
+            "saml_force_name_id_format": "false",
+            "saml.client.signature": "false",
+            "saml.authnstatement": "false",
+            "saml.server.signature": "false",
+            "saml.server.signature.keyinfo.ext": "false",
+            "saml.onetimeuse.condition": "false"
+        },
+        "fullScopeAllowed": true,
+        "nodeReRegistrationTimeout": -1,
+        "protocolMappers": [
+            {
+                "name": "role list",
+                "protocol": "saml",
+                "protocolMapper": "saml-role-list-mapper",
+                "consentRequired": false,
+                "config": {
+                    "single": "false",
+                    "attribute.nameformat": "Basic",
+                    "attribute.name": "Role"
+                }
+            },
+            {
+                "name": "family name",
+                "protocol": "openid-connect",
+                "protocolMapper": "oidc-usermodel-property-mapper",
+                "consentRequired": true,
+                "consentText": "${familyName}",
+                "config": {
+                    "userinfo.token.claim": "true",
+                    "user.attribute": "lastName",
+                    "id.token.claim": "true",
+                    "access.token.claim": "true",
+                    "claim.name": "family_name",
+                    "jsonType.label": "String"
+                }
+            },
+            {
+                "name": "full name",
+                "protocol": "openid-connect",
+                "protocolMapper": "oidc-full-name-mapper",
+                "consentRequired": true,
+                "consentText": "${fullName}",
+                "config": {
+                    "id.token.claim": "true",
+                    "access.token.claim": "true",
+                    "userinfo.token.claim": "true"
+                }
+            },
+            {
+                "name": "username",
+                "protocol": "openid-connect",
+                "protocolMapper": "oidc-usermodel-property-mapper",
+                "consentRequired": true,
+                "consentText": "${username}",
+                "config": {
+                    "userinfo.token.claim": "true",
+                    "user.attribute": "username",
+                    "id.token.claim": "true",
+                    "access.token.claim": "true",
+                    "claim.name": "preferred_username",
+                    "jsonType.label": "String"
+                }
+            },
+            {
+                "name": "email",
+                "protocol": "openid-connect",
+                "protocolMapper": "oidc-usermodel-property-mapper",
+                "consentRequired": true,
+                "consentText": "${email}",
+                "config": {
+                    "userinfo.token.claim": "true",
+                    "user.attribute": "email",
+                    "id.token.claim": "true",
+                    "access.token.claim": "true",
+                    "claim.name": "email",
+                    "jsonType.label": "String"
+                }
+            },
+            {
+                "name": "given name",
+                "protocol": "openid-connect",
+                "protocolMapper": "oidc-usermodel-property-mapper",
+                "consentRequired": true,
+                "consentText": "${givenName}",
+                "config": {
+                    "userinfo.token.claim": "true",
+                    "user.attribute": "firstName",
+                    "id.token.claim": "true",
+                    "access.token.claim": "true",
+                    "claim.name": "given_name",
+                    "jsonType.label": "String"
+                }
+            }
+        ],
+        "useTemplateConfig": false,
+        "useTemplateScope": false,
+        "useTemplateMappers": false,
+        "access": {
+            "view": true,
+            "configure": true,
+            "manage": true
+        }
+    }
+  ],
+  "clientTemplates": [],
+  "browserSecurityHeaders": {
+    "xContentTypeOptions": "nosniff",
+    "xRobotsTag": "none",
+    "xFrameOptions": "SAMEORIGIN",
+    "xXSSProtection": "1; mode=block",
+    "contentSecurityPolicy": "frame-src 'self'"
+  },
+  "smtpServer": {
+    "password": "",
+    "starttls": "",
+    "auth": "true",
+    "port": "587",
+    "host": "",
+    "from": "",
+    "ssl": "",
+    "user": ""
+  },
+  "loginTheme": "sunbird",
+  "accountTheme": "keycloak",
+  "adminTheme": "keycloak",
+  "emailTheme": "keycloak",
+  "eventsEnabled": false,
+  "eventsListeners": [
+    "jboss-logging"
+  ],
+  "enabledEventTypes": [],
+  "adminEventsEnabled": false,
+  "adminEventsDetailsEnabled": false,
+  "components": {
+    "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy": [
+      {
+        "id": "84078bbb-e005-44c8-9c7d-a1b4821558da",
+        "name": "Max Clients Limit",
+        "providerId": "max-clients",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "max-clients": [
+            "200"
+          ]
+        }
+      },
+      {
+        "id": "346d857e-4385-4f8f-a2fc-072fd11a10ec",
+        "name": "Allowed Protocol Mapper Types",
+        "providerId": "allowed-protocol-mappers",
+        "subType": "authenticated",
+        "subComponents": {},
+        "config": {
+          "allowed-protocol-mapper-types": [
+            "oidc-full-name-mapper",
+            "oidc-address-mapper",
+            "saml-user-property-mapper",
+            "oidc-usermodel-property-mapper",
+            "saml-user-attribute-mapper",
+            "oidc-sha256-pairwise-sub-mapper",
+            "saml-role-list-mapper",
+            "oidc-usermodel-attribute-mapper"
+          ],
+          "consent-required-for-all-mappers": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "eed64f9f-4b66-45ad-bdb4-4070e3802366",
+        "name": "Allowed Client Templates",
+        "providerId": "allowed-client-templates",
+        "subType": "authenticated",
+        "subComponents": {},
+        "config": {}
+      },
+      {
+        "id": "17ac4eaa-9139-4b3a-b1db-c82d44c1531d",
+        "name": "Allowed Client Templates",
+        "providerId": "allowed-client-templates",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      },
+      {
+        "id": "38532936-be91-40e4-b65d-c0abfaf9547c",
+        "name": "Full Scope Disabled",
+        "providerId": "scope",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      },
+      {
+        "id": "8c1690a2-6eea-4d61-ab66-7a015e3bea3c",
+        "name": "Allowed Protocol Mapper Types",
+        "providerId": "allowed-protocol-mappers",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "allowed-protocol-mapper-types": [
+            "saml-role-list-mapper",
+            "oidc-usermodel-attribute-mapper",
+            "oidc-full-name-mapper",
+            "oidc-usermodel-property-mapper",
+            "oidc-address-mapper",
+            "saml-user-property-mapper",
+            "saml-user-attribute-mapper",
+            "oidc-sha256-pairwise-sub-mapper"
+          ],
+          "consent-required-for-all-mappers": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "3dcc314c-07f8-484d-9535-29424dbaddfc",
+        "name": "Trusted Hosts",
+        "providerId": "trusted-hosts",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "host-sending-registration-request-must-match": [
+            "true"
+          ],
+          "client-uris-must-match": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "ab52b781-64b9-42a0-99f5-cbeba6710763",
+        "name": "Consent Required",
+        "providerId": "consent-required",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      }
+    ],
+    "org.keycloak.keys.KeyProvider": [
+      {
+        "id": "bd30c46f-9ee3-443d-9faa-6ed8075aac87",
+        "name": "rsa-generated",
+        "providerId": "rsa-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ]
+        }
+      },
+      {
+        "id": "a93cc73f-b070-48cd-bf08-9b290707c2f5",
+        "name": "hmac-generated",
+        "providerId": "hmac-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ]
+        }
+      }
+    ]
+  },
+  "internationalizationEnabled": false,
+  "supportedLocales": [],
+  "defaultLocale": "en",
+  "authenticationFlows": [
+    {
+      "id": "976a6147-7a63-48cd-ab6d-ac3a2f0ffa42",
+      "alias": "Direct Grant 2",
+      "description": "OpenID Connect Resource Owner Grant",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": false,
+      "authenticationExecutions": [
+        {
+          "authenticator": "direct-grant-validate-username",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "direct-grant-validate-password",
+          "requirement": "DISABLED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "direct-grant-validate-otp",
+          "requirement": "OPTIONAL",
+          "priority": 30,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "fe01a5ba-9b8b-4211-8a71-273800b0309d",
+      "alias": "Direct Grant w/o Password",
+      "description": "Grant user access using only the username and no password.",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": false,
+      "authenticationExecutions": []
+    },
+    {
+      "id": "797d8e90-1fb5-48bc-b6f0-e44766721af0",
+      "alias": "Handle Existing Account",
+      "description": "Handle what to do if there is existing account with same email/username like authenticated identity provider",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-confirm-link",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "idp-email-verification",
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "flowAlias": "Verify Existing Account by Re-authentication",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "5f70fc7a-42b6-41cd-aaf9-a3837fc05f43",
+      "alias": "Phone number login",
+      "description": "browser based authentication",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": false,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-cookie",
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-spnego",
+          "requirement": "DISABLED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "identity-provider-redirector",
+          "requirement": "ALTERNATIVE",
+          "priority": 25,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "flowAlias": "Phone number login forms",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "b886ae3f-e90a-4309-bb05-5367c3ec977b",
+      "alias": "Phone number login forms",
+      "description": "Username, password, otp and other auth forms.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": false,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-phone-password-form",
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "requirement": "DISABLED",
+          "priority": 21,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "8dc1276b-946b-4c49-97d2-ade016fd9df8",
+      "alias": "Reset Credentials Via SMS OTP",
+      "description": "Reset credentials for a user if they forgot their password or something",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": false,
+      "authenticationExecutions": [
+        {
+          "authenticator": "reset-credentials-choose-user",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorConfig": "Reset Credentials Via SMS OTP",
+          "authenticator": "sms-authentication",
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-password",
+          "requirement": "REQUIRED",
+          "priority": 40,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-otp",
+          "requirement": "OPTIONAL",
+          "priority": 41,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "14838047-af17-4104-a714-bf51bd0aa699",
+      "alias": "Verify Existing Account by Re-authentication",
+      "description": "Reauthentication of existing account",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-username-password-form",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "requirement": "OPTIONAL",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "7ab0a65d-641e-4ba0-8793-35e363ba8362",
+      "alias": "browser",
+      "description": "browser based authentication",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-cookie",
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-spnego",
+          "requirement": "DISABLED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "identity-provider-redirector",
+          "requirement": "ALTERNATIVE",
+          "priority": 25,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "flowAlias": "forms",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "b2aedbfb-9432-4f47-8114-c6031c884b5f",
+      "alias": "clients",
+      "description": "Base authentication for clients",
+      "providerId": "client-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "client-secret",
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "client-jwt",
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "78809b88-19c3-4351-ac1a-e1c43dd71143",
+      "alias": "direct grant",
+      "description": "OpenID Connect Resource Owner Grant",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "direct-grant-validate-username",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "direct-grant-validate-password",
+          "requirement": "DISABLED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "direct-grant-validate-otp",
+          "requirement": "OPTIONAL",
+          "priority": 30,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "025a77cf-895a-4622-95a0-fdd9912aeb9a",
+      "alias": "docker auth",
+      "description": "Used by Docker clients to authenticate against the IDP",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "docker-http-basic-authenticator",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "1ea8d8e5-7997-43d0-9ce4-0ec187d9c5be",
+      "alias": "first broker login",
+      "description": "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticatorConfig": "review profile config",
+          "authenticator": "idp-review-profile",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorConfig": "create unique user config",
+          "authenticator": "idp-create-user-if-unique",
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "flowAlias": "Handle Existing Account",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "5ae10869-08a5-489b-97c6-b6f65a40de21",
+      "alias": "forms",
+      "description": "Username, password, otp and other auth forms.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-username-password-form",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "requirement": "OPTIONAL",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "1be582c9-b469-4092-82d4-365fb6d02963",
+      "alias": "registration",
+      "description": "registration flow",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "registration-page-form",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "flowAlias": "registration form",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "e71bd4ef-a33e-4a75-a8fc-8cfaf6a1119b",
+      "alias": "registration form",
+      "description": "registration form",
+      "providerId": "form-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "registration-user-creation",
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "registration-profile-action",
+          "requirement": "REQUIRED",
+          "priority": 40,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "registration-password-action",
+          "requirement": "REQUIRED",
+          "priority": 50,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "registration-recaptcha-action",
+          "requirement": "DISABLED",
+          "priority": 60,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "6c4e8128-0eb4-4303-bbec-3e5baec31022",
+      "alias": "reset credentials",
+      "description": "Reset credentials for a user if they forgot their password or something",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "reset-credentials-choose-user",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-credential-email",
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-password",
+          "requirement": "REQUIRED",
+          "priority": 30,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-otp",
+          "requirement": "OPTIONAL",
+          "priority": 40,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "ec7bae86-99e4-403a-a041-1039bacba45e",
+      "alias": "saml ecp",
+      "description": "SAML ECP Profile Authentication Flow",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "http-basic-authenticator",
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    }
+  ],
+  "authenticatorConfig": [
+    {
+      "id": "7d7aa155-54cd-4b62-bc7f-558ce934e0a5",
+      "alias": "Reset Credentials Via SMS OTP",
+      "config": {
+        "sms-auth.code.length": "6",
+        "sms-auth.msg.text": "Reset your password on PREPROD with the OTP %sms-code%. The OTP is valid for 5 minutes.",
+        "sms-auth.code.ttl": "300"
+      }
+    },
+    {
+      "id": "cc029554-f8bc-49c2-81cc-f0f7141bf178",
+      "alias": "create unique user config",
+      "config": {
+        "require.password.update.after.registration": "false"
+      }
+    },
+    {
+      "id": "6a2402e1-b718-43a0-9b65-2a7b62d3b935",
+      "alias": "review profile config",
+      "config": {
+        "update.profile.on.first.login": "missing"
+      }
+    }
+  ],
+  "requiredActions": [
+    {
+      "alias": "CONFIGURE_TOTP",
+      "name": "Configure OTP",
+      "providerId": "CONFIGURE_TOTP",
+      "enabled": true,
+      "defaultAction": false,
+      "config": {}
+    },
+    {
+      "alias": "UPDATE_PASSWORD",
+      "name": "Update Password",
+      "providerId": "UPDATE_PASSWORD",
+      "enabled": true,
+      "defaultAction": false,
+      "config": {}
+    },
+    {
+      "alias": "UPDATE_PROFILE",
+      "name": "Update Profile",
+      "providerId": "UPDATE_PROFILE",
+      "enabled": true,
+      "defaultAction": false,
+      "config": {}
+    },
+    {
+      "alias": "VERIFY_EMAIL",
+      "name": "Verify Email",
+      "providerId": "VERIFY_EMAIL",
+      "enabled": true,
+      "defaultAction": false,
+      "config": {}
+    },
+    {
+      "alias": "terms_and_conditions",
+      "name": "Terms and Conditions",
+      "providerId": "terms_and_conditions",
+      "enabled": true,
+      "defaultAction": false,
+      "config": {}
+    }
+  ],
+  "browserFlow": "Phone number login",
+  "registrationFlow": "registration",
+  "directGrantFlow": "Direct Grant 2",
+  "resetCredentialsFlow": "Reset Credentials Via SMS OTP",
+  "clientAuthenticationFlow": "clients",
+  "dockerAuthenticationFlow": "docker auth",
+  "attributes": {
+    "_browser_header.xXSSProtection": "1; mode=block",
+    "_browser_header.xFrameOptions": "SAMEORIGIN",
+    "quickLoginCheckMilliSeconds": "1000",
+    "permanentLockout": "false",
+    "_browser_header.xRobotsTag": "none",
+    "maxFailureWaitSeconds": "900",
+    "minimumQuickLoginWaitSeconds": "60",
+    "failureFactor": "30",
+    "actionTokenGeneratedByUserLifespan": "300",
+    "maxDeltaTimeSeconds": "43200",
+    "_browser_header.xContentTypeOptions": "nosniff",
+    "actionTokenGeneratedByAdminLifespan": "43200",
+    "bruteForceProtected": "true",
+    "_browser_header.contentSecurityPolicy": "frame-src 'self'",
+    "waitIncrementSeconds": "60"
+  },
+  "keycloakVersion": "3.2.0.Final"
+}
\ No newline at end of file
diff --git a/ansible/roles/keycloak-deploy-6.0/templates/module.xml.j2 b/ansible/roles/keycloak-deploy-6.0/templates/module.xml.j2
new file mode 100644
index 000000000..fc3c43c66
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/templates/module.xml.j2
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.3" name="org.postgresql">
+    <resources>
+        <resource-root path="postgresql-9.4.1212.jar"/>
+    </resources>
+    <dependencies>
+        <module name="javax.api"/>
+        <module name="javax.transaction.api"/>
+    </dependencies>
+</module>
diff --git a/ansible/roles/keycloak-deploy/templates/standalone-ha-single.xml b/ansible/roles/keycloak-deploy-6.0/templates/standalone-ha-single.xml
similarity index 100%
rename from ansible/roles/keycloak-deploy/templates/standalone-ha-single.xml
rename to ansible/roles/keycloak-deploy-6.0/templates/standalone-ha-single.xml
diff --git a/ansible/roles/keycloak-deploy-6.0/templates/standalone-ha.xml b/ansible/roles/keycloak-deploy-6.0/templates/standalone-ha.xml
new file mode 100644
index 000000000..14ee65162
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/templates/standalone-ha.xml
@@ -0,0 +1,673 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<server xmlns="urn:jboss:domain:10.0">
+    <extensions>
+        <extension module="org.jboss.as.clustering.infinispan"/>
+        <extension module="org.jboss.as.clustering.jgroups"/>
+        <extension module="org.jboss.as.connector"/>
+        <extension module="org.jboss.as.deployment-scanner"/>
+        <extension module="org.jboss.as.ee"/>
+        <extension module="org.jboss.as.ejb3"/>
+        <extension module="org.jboss.as.jaxrs"/>
+        <extension module="org.jboss.as.jmx"/>
+        <extension module="org.jboss.as.jpa"/>
+        <extension module="org.jboss.as.logging"/>
+        <extension module="org.jboss.as.mail"/>
+        <extension module="org.jboss.as.modcluster"/>
+        <extension module="org.jboss.as.naming"/>
+        <extension module="org.jboss.as.remoting"/>
+        <extension module="org.jboss.as.security"/>
+        <extension module="org.jboss.as.transactions"/>
+        <extension module="org.keycloak.keycloak-server-subsystem"/>
+        <extension module="org.wildfly.extension.bean-validation"/>
+        <extension module="org.wildfly.extension.core-management"/>
+        <extension module="org.wildfly.extension.elytron"/>
+        <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
+        <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
+        <extension module="org.wildfly.extension.microprofile.metrics-smallrye"/>
+        <extension module="org.wildfly.extension.request-controller"/>
+        <extension module="org.wildfly.extension.security.manager"/>
+        <extension module="org.wildfly.extension.undertow"/>
+    </extensions>
+    <management>
+        <security-realms>
+            <security-realm name="ManagementRealm">
+                <authentication>
+                    <local default-user="$local" skip-group-loading="true"/>
+                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization map-groups-to-roles="false">
+                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+            <security-realm name="ApplicationRealm">
+                <server-identities>
+                    <ssl>
+                        <keystore path="application.keystore" relative-to="jboss.server.config.dir" keystore-password="password" alias="server" key-password="password" generate-self-signed-certificate-host="localhost"/>
+                    </ssl>
+                </server-identities>
+                <authentication>
+                    <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
+                    <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization>
+                    <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+        </security-realms>
+        <audit-log>
+            <formatters>
+                <json-formatter name="json-formatter"/>
+            </formatters>
+            <handlers>
+                <file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
+            </handlers>
+            <logger log-boot="true" log-read-only="false" enabled="false">
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
+            </logger>
+        </audit-log>
+        <management-interfaces>
+            <http-interface security-realm="ManagementRealm">
+                <http-upgrade enabled="true"/>
+                <socket-binding http="management-http"/>
+            </http-interface>
+        </management-interfaces>
+        <access-control provider="simple">
+            <role-mapping>
+                <role name="SuperUser">
+                    <include>
+                        <user name="$local"/>
+                    </include>
+                </role>
+            </role-mapping>
+        </access-control>
+    </management>
+    <profile>
+        <subsystem xmlns="urn:jboss:domain:logging:6.0">
+            <console-handler name="CONSOLE">
+                <level name="INFO"/>
+                <formatter>
+                    <named-formatter name="COLOR-PATTERN"/>
+                </formatter>
+            </console-handler>
+            <periodic-rotating-file-handler name="FILE" autoflush="true">
+                <formatter>
+                    <named-formatter name="PATTERN"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="server.log"/>
+                <suffix value=".yyyy-MM-dd"/>
+                <append value="true"/>
+            </periodic-rotating-file-handler>
+            <logger category="com.arjuna">
+                <level name="WARN"/>
+            </logger>
+            <logger category="io.jaegertracing.Configuration">
+                <level name="WARN"/>
+            </logger>
+            <logger category="org.jboss.as.config">
+                <level name="DEBUG"/>
+            </logger>
+            <logger category="sun.rmi">
+                <level name="WARN"/>
+            </logger>
+            <root-logger>
+                <level name="INFO"/>
+                <handlers>
+                    <handler name="CONSOLE"/>
+                    <handler name="FILE"/>
+                </handlers>
+            </root-logger>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+            </formatter>
+            <formatter name="COLOR-PATTERN">
+                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+            </formatter>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:datasources:5.0">
+            <datasources>
+                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
+                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
+                    <driver>h2</driver>
+                    <security>
+                        <user-name>sa</user-name>
+                        <password>sa</password>
+                    </security>
+                </datasource>
+                <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
+                    <connection-property name="url">jdbc:postgresql://{{keycloak_postgres_host}}:5432/{{ keycloak_postgres_database }}?sslmode=require</connection-property>
+                    <driver>postgresql</driver>
+                    <security>
+                        <user-name>{{ keycloak_postgres_user }}</user-name>
+                        <password>{{ keycloak_postgres_password }}</password>
+                    </security>
+
+                <validation>
+                      <check-valid-connection-sql>select 1</check-valid-connection-sql>
+                      <validate-on-match>false</validate-on-match>
+                      <background-validation>true</background-validation>
+                      <background-validation-millis>120000</background-validation-millis>
+                </validation>
+                <statement>
+                      <share-prepared-statements>false</share-prepared-statements>
+                </statement>
+                </datasource>
+
+                <drivers>
+                    <driver name="h2" module="com.h2database.h2">
+                        <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+                    </driver>
+                    <driver name="postgresql" module="org.postgresql">
+                        <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
+                        <datasource-class>org.postgresql.ds.PGPoolingDataSource</datasource-class>
+                    </driver>
+                </drivers>
+            </datasources>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ee:4.0">
+            <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+            <concurrent>
+                <context-services>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                </context-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                </managed-thread-factories>
+                <managed-executor-services>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" keepalive-time="5000"/>
+                </managed-executor-services>
+                <managed-scheduled-executor-services>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
+                </managed-scheduled-executor-services>
+            </concurrent>
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ejb3:5.0">
+            <session-bean>
+                <stateless>
+                    <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+                </stateless>
+                <stateful default-access-timeout="5000" cache-ref="distributable" passivation-disabled-cache-ref="simple"/>
+                <singleton default-access-timeout="5000"/>
+            </session-bean>
+            <pools>
+                <bean-instance-pools>
+                    <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                </bean-instance-pools>
+            </pools>
+            <caches>
+                <cache name="simple"/>
+                <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
+            </caches>
+            <passivation-stores>
+                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
+            </passivation-stores>
+            <async thread-pool-name="default"/>
+            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+                <data-stores>
+                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+                </data-stores>
+            </timer-service>
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default">
+                <channel-creation-options>
+                    <option name="READ_TIMEOUT" value="${prop.remoting-connector.read.timeout:20}" type="xnio"/>
+                    <option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
+                </channel-creation-options>
+            </remote>
+            <thread-pools>
+                <thread-pool name="default">
+                    <max-threads count="10"/>
+                    <keepalive-time time="100" unit="milliseconds"/>
+                </thread-pool>
+            </thread-pools>
+            <default-security-domain value="other"/>
+            <default-missing-method-permissions-deny-access value="true"/>
+            <statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
+            <log-system-exceptions value="true"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:io:3.0">
+            <worker name="default"/>
+            <buffer-pool name="default"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:8.0">
+            <cache-container name="keycloak" >
+                <transport lock-timeout="60000"/>
+                <local-cache name="realms">
+                    <object-memory size="10000"/>
+                </local-cache>
+                <local-cache name="users">
+                    <object-memory size="10000"/>
+                </local-cache>
+                <distributed-cache name="sessions" owners="1"/>
+                <distributed-cache name="authenticationSessions" owners="1"/>
+                <distributed-cache name="offlineSessions" owners="1"/>
+                <distributed-cache name="clientSessions" owners="1"/>
+                <distributed-cache name="offlineClientSessions" owners="1"/>
+                <distributed-cache name="loginFailures" owners="1"/>
+                <local-cache name="authorization">
+                    <object-memory size="10000"/>
+                </local-cache>
+                <replicated-cache name="work"/>
+                <local-cache name="keys">
+                    <object-memory size="1000"/>
+                    <expiration max-idle="3600000"/>
+                </local-cache>
+                <distributed-cache name="actionTokens" owners="2">
+                    <object-memory size="-1"/>
+                    <expiration max-idle="-1" interval="300000"/>
+                </distributed-cache>
+            </cache-container>
+            <cache-container name="server" aliases="singleton cluster" default-cache="default" module="org.wildfly.clustering.server">
+                <transport lock-timeout="60000"/>
+                <replicated-cache name="default">
+                    <transaction mode="BATCH"/>
+                </replicated-cache>
+            </cache-container>
+            <cache-container name="web" default-cache="dist" module="org.wildfly.clustering.web.infinispan">
+                <transport lock-timeout="60000"/>
+                <distributed-cache name="dist">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <file-store/>
+                </distributed-cache>
+            </cache-container>
+            <cache-container name="ejb" aliases="sfsb" default-cache="dist" module="org.wildfly.clustering.ejb.infinispan">
+                <transport lock-timeout="60000"/>
+                <distributed-cache name="dist">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <file-store/>
+                </distributed-cache>
+            </cache-container>
+            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
+                <transport lock-timeout="60000"/>
+                <local-cache name="local-query">
+                    <object-memory size="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <invalidation-cache name="entity">
+                    <transaction mode="NON_XA"/>
+                    <object-memory size="10000"/>
+                    <expiration max-idle="100000"/>
+                </invalidation-cache>
+                <replicated-cache name="timestamps"/>
+            </cache-container>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jca:5.0">
+            <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
+            <bean-validation enabled="true"/>
+            <default-workmanager>
+                <short-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </short-running-threads>
+                <long-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </long-running-threads>
+            </default-workmanager>
+            <cached-connection-manager/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jgroups:6.0">
+            <channels default="ee">
+                <channel name="ee" stack="tcp"/>
+            </channels>
+            <stacks default="tcp">
+                <stack name="udp">
+                    <transport type="UDP" socket-binding="jgroups-udp"/>
+                    <protocol type="PING"/>
+                    <protocol type="MERGE3"/>
+                    <protocol type="FD_SOCK"/>
+                    <protocol type="FD_ALL"/>
+                    <protocol type="VERIFY_SUSPECT"/>
+                    <protocol type="pbcast.NAKACK2"/>
+                    <protocol type="UNICAST3"/>
+                    <protocol type="pbcast.STABLE"/>
+                    <protocol type="pbcast.GMS"/>
+                    <protocol type="UFC"/>
+                    <protocol type="MFC"/>
+                    <protocol type="FRAG3"/>
+                </stack>
+
+            <stack name="tcp">
+                    <transport type="TCP" socket-binding="jgroups-tcp"/>
+                    <protocol type="TCPPING">
+                        <property name="initial_hosts">{{groups['keycloak'] | difference(ansible_default_ipv4.address) | join('[7600],')}}[7600]</property>
+                        <property name="port_range">10</property>
+                    </protocol>
+                    <protocol type="MERGE3"/>
+                    <protocol type="FD_SOCK" socket-binding="jgroups-tcp-fd"/>
+                    <protocol type="FD"/>
+                    <protocol type="VERIFY_SUSPECT"/>
+                    <protocol type="pbcast.NAKACK2"/>
+                    <protocol type="UNICAST3"/>
+                    <protocol type="pbcast.STABLE"/>
+                    <protocol type="pbcast.GMS"/>
+                    <protocol type="MFC"/>
+                    <protocol type="FRAG2"/>
+                </stack>
+
+            </stacks>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
+            <expose-resolved-model/>
+            <expose-expression-model/>
+            <remoting-connector/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jpa:1.1">
+            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:mail:3.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
+                <smtp-server outbound-socket-binding-ref="mail-smtp"/>
+            </mail-session>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:modcluster:5.0">
+            <proxy name="default" advertise-socket="modcluster" listener="ajp">
+                <dynamic-load-provider>
+                    <load-metric type="cpu"/>
+                </dynamic-load-provider>
+            </proxy>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:naming:2.0">
+            <remote-naming/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:remoting:4.0">
+            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
+            <deployment-permissions>
+                <maximum-set>
+                    <permission class="java.security.AllPermission"/>
+                </maximum-set>
+            </deployment-permissions>
+        </subsystem>
+        <subsystem xmlns="urn:wildfly:elytron:6.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
+            <providers>
+                <aggregate-providers name="combined-providers">
+                    <providers name="elytron"/>
+                    <providers name="openssl"/>
+                </aggregate-providers>
+                <provider-loader name="elytron" module="org.wildfly.security.elytron"/>
+                <provider-loader name="openssl" module="org.wildfly.openssl"/>
+            </providers>
+            <audit-logging>
+                <file-audit-log name="local-audit" path="audit.log" relative-to="jboss.server.log.dir" format="JSON"/>
+            </audit-logging>
+            <security-domains>
+                <security-domain name="ApplicationDomain" default-realm="ApplicationRealm" permission-mapper="default-permission-mapper">
+                    <realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
+                    <realm name="local"/>
+                </security-domain>
+                <security-domain name="ManagementDomain" default-realm="ManagementRealm" permission-mapper="default-permission-mapper">
+                    <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
+                    <realm name="local" role-mapper="super-user-mapper"/>
+                </security-domain>
+            </security-domains>
+            <security-realms>
+                <identity-realm name="local" identity="$local"/>
+                <properties-realm name="ApplicationRealm">
+                    <users-properties path="application-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ApplicationRealm"/>
+                    <groups-properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
+                </properties-realm>
+                <properties-realm name="ManagementRealm">
+                    <users-properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ManagementRealm"/>
+                    <groups-properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </properties-realm>
+            </security-realms>
+            <mappers>
+                <simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
+                    <permission-mapping>
+                        <principal name="anonymous"/>
+                        <permission-set name="default-permissions"/>
+                    </permission-mapping>
+                    <permission-mapping match-all="true">
+                        <permission-set name="login-permission"/>
+                        <permission-set name="default-permissions"/>
+                    </permission-mapping>
+                </simple-permission-mapper>
+                <constant-realm-mapper name="local" realm-name="local"/>
+                <simple-role-decoder name="groups-to-roles" attribute="groups"/>
+                <constant-role-mapper name="super-user-mapper">
+                    <role name="SuperUser"/>
+                </constant-role-mapper>
+            </mappers>
+            <permission-sets>
+                <permission-set name="login-permission">
+                    <permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
+                </permission-set>
+                <permission-set name="default-permissions">
+                    <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission" module="org.wildfly.extension.batch.jberet" target-name="*"/>
+                    <permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission" module="org.wildfly.transaction.client"/>
+                    <permission class-name="org.jboss.ejb.client.RemoteEJBPermission" module="org.jboss.ejb-client"/>
+                </permission-set>
+            </permission-sets>
+            <http>
+                <http-authentication-factory name="management-http-authentication" security-domain="ManagementDomain" http-server-mechanism-factory="global">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="DIGEST">
+                            <mechanism-realm realm-name="ManagementRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </http-authentication-factory>
+                <provider-http-server-mechanism-factory name="global"/>
+            </http>
+            <sasl>
+                <sasl-authentication-factory name="application-sasl-authentication" sasl-server-factory="configured" security-domain="ApplicationDomain">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
+                        <mechanism mechanism-name="DIGEST-MD5">
+                            <mechanism-realm realm-name="ApplicationRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </sasl-authentication-factory>
+                <sasl-authentication-factory name="management-sasl-authentication" sasl-server-factory="configured" security-domain="ManagementDomain">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
+                        <mechanism mechanism-name="DIGEST-MD5">
+                            <mechanism-realm realm-name="ManagementRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </sasl-authentication-factory>
+                <configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
+                    <properties>
+                        <property name="wildfly.sasl.local-user.default-user" value="$local"/>
+                    </properties>
+                </configurable-sasl-server-factory>
+                <mechanism-provider-filtering-sasl-server-factory name="elytron" sasl-server-factory="global">
+                    <filters>
+                        <filter provider-name="WildFlyElytron"/>
+                    </filters>
+                </mechanism-provider-filtering-sasl-server-factory>
+                <provider-sasl-server-factory name="global"/>
+            </sasl>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:security:2.0">
+            <security-domains>
+                <security-domain name="other" cache-type="default">
+                    <authentication>
+                        <login-module code="Remoting" flag="optional">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                        <login-module code="RealmDirect" flag="required">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                    </authentication>
+                </security-domain>
+                <security-domain name="jboss-web-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+                <security-domain name="jaspitest" cache-type="default">
+                    <authentication-jaspi>
+                        <login-module-stack name="dummy">
+                            <login-module code="Dummy" flag="optional"/>
+                        </login-module-stack>
+                        <auth-module code="Dummy"/>
+                    </authentication-jaspi>
+                </security-domain>
+                <security-domain name="jboss-ejb-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+            </security-domains>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:transactions:5.0">
+            <core-environment node-identifier="${jboss.tx.node.id:1}">
+                <process-id>
+                    <uuid/>
+                </process-id>
+            </core-environment>
+            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+            <coordinator-environment statistics-enabled="${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
+            <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
+        </subsystem>
+        <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>
+        <subsystem xmlns="urn:wildfly:microprofile-health-smallrye:1.0" security-enabled="false"/>
+        <subsystem xmlns="urn:wildfly:microprofile-metrics-smallrye:2.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:wildfly}"/>
+        <subsystem xmlns="urn:jboss:domain:undertow:8.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other" statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
+            <buffer-cache name="default"/>
+            <server name="default-server">
+                <ajp-listener name="ajp" socket-binding="ajp"/>
+                <http-listener name="default" socket-binding="http" proxy-address-forwarding="true" redirect-socket="https" enable-http2="true"/>
+                <https-listener name="https" socket-binding="https" security-realm="ApplicationRealm" enable-http2="true"/>
+                <host name="default-host" alias="localhost">
+                    <location name="/" handler="welcome-content"/>
+                    <http-invoker security-realm="ApplicationRealm"/>
+                </host>
+            </server>
+            <servlet-container name="default">
+                <jsp-config/>
+                <websockets/>
+            </servlet-container>
+            <handlers>
+                <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
+            </handlers>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:keycloak-server:1.1">
+            <web-context>auth</web-context>
+            <providers>
+                <provider>classpath:${jboss.home.dir}/providers/*</provider>
+            </providers>
+            <master-realm-name>master</master-realm-name>
+            <scheduled-task-interval>900</scheduled-task-interval>
+            <theme>
+                <staticMaxAge>2592000</staticMaxAge>
+                <cacheThemes>true</cacheThemes>
+                <cacheTemplates>true</cacheTemplates>
+                <dir>${jboss.home.dir}/themes</dir>
+            </theme>
+            <spi name="eventsStore">
+                <provider name="jpa" enabled="true">
+                    <properties>
+                        <property name="exclude-events" value="[&quot;REFRESH_TOKEN&quot;]"/>
+                    </properties>
+                </provider>
+            </spi>
+            <spi name="userCache">
+                <provider name="default" enabled="true"/>
+            </spi>
+            <spi name="userSessionPersister">
+                <default-provider>jpa</default-provider>
+            </spi>
+            <spi name="timer">
+                <default-provider>basic</default-provider>
+            </spi>
+            <spi name="connectionsHttpClient">
+                <provider name="default" enabled="true"/>
+            </spi>
+            <spi name="connectionsJpa">
+                <provider name="default" enabled="true">
+                    <properties>
+                        <property name="dataSource" value="java:jboss/datasources/KeycloakDS"/>
+                        <property name="initializeEmpty" value="true"/>
+                        <property name="migrationStrategy" value="update"/>
+                        <property name="migrationExport" value="${jboss.home.dir}/keycloak-database-update.sql"/>
+                    </properties>
+                </provider>
+            </spi>
+            <spi name="realmCache">
+                <provider name="default" enabled="true"/>
+            </spi>
+            <spi name="connectionsInfinispan">
+                <default-provider>default</default-provider>
+                <provider name="default" enabled="true">
+                    <properties>
+                        <property name="cacheContainer" value="java:jboss/infinispan/container/keycloak"/>
+                    </properties>
+                </provider>
+            </spi>
+            <spi name="jta-lookup">
+                <default-provider>${keycloak.jta.lookup.provider:jboss}</default-provider>
+                <provider name="jboss" enabled="true"/>
+            </spi>
+            <spi name="publicKeyStorage">
+                <provider name="infinispan" enabled="true">
+                    <properties>
+                        <property name="minTimeBetweenRequests" value="10"/>
+                    </properties>
+                </provider>
+            </spi>
+            <spi name="x509cert-lookup">
+                <default-provider>${keycloak.x509cert.lookup.provider:default}</default-provider>
+                <provider name="default" enabled="true"/>
+            </spi>
+            <spi name="hostname">
+                <default-provider>request</default-provider>
+                <provider name="fixed" enabled="true">
+                    <properties>
+                        <property name="hostname" value="localhost"/>
+                        <property name="httpPort" value="-1"/>
+                        <property name="httpsPort" value="-1"/>
+                    </properties>
+                </provider>
+            </spi>
+        </subsystem>
+    </profile>
+    <interfaces>
+        <interface name="management">
+            <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+        </interface>
+        <interface name="public">
+            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+        </interface>
+        <interface name="private">
+            <inet-address value="${jboss.bind.address.private:127.0.0.1}"/>
+        </interface>
+    </interfaces>
+    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
+        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
+        <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
+        <socket-binding name="https" port="${jboss.https.port:8443}"/>
+        <socket-binding name="jgroups-mping" interface="private" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
+          <socket-binding name="jgroups-tcp" interface="private" port="7600"/>
+          <socket-binding name="jgroups-tcp-fd" interface="private" port="57600"/>
+          <socket-binding name="jgroups-udp-fd" interface="private" port="54200"/>
+        <socket-binding name="jgroups-udp" interface="private" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
+        <socket-binding name="modcluster" multicast-address="${jboss.modcluster.multicast.address:224.0.1.105}" multicast-port="23364"/>
+        <socket-binding name="txn-recovery-environment" port="4712"/>
+        <socket-binding name="txn-status-manager" port="4713"/>
+        <outbound-socket-binding name="mail-smtp">
+            <remote-destination host="localhost" port="25"/>
+        </outbound-socket-binding>
+    </socket-binding-group>
+</server>
diff --git a/ansible/roles/keycloak-deploy-6.0/templates/standalone.xml b/ansible/roles/keycloak-deploy-6.0/templates/standalone.xml
new file mode 100644
index 000000000..c1959c7f2
--- /dev/null
+++ b/ansible/roles/keycloak-deploy-6.0/templates/standalone.xml
@@ -0,0 +1,471 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<server xmlns="urn:jboss:domain:4.0">
+    <extensions>
+        <extension module="org.jboss.as.clustering.infinispan"/>
+        <extension module="org.jboss.as.connector"/>
+        <extension module="org.jboss.as.deployment-scanner"/>
+        <extension module="org.jboss.as.ee"/>
+        <extension module="org.jboss.as.ejb3"/>
+        <extension module="org.jboss.as.jaxrs"/>
+        <extension module="org.jboss.as.jdr"/>
+        <extension module="org.jboss.as.jmx"/>
+        <extension module="org.jboss.as.jpa"/>
+        <extension module="org.jboss.as.jsf"/>
+        <extension module="org.jboss.as.logging"/>
+        <extension module="org.jboss.as.mail"/>
+        <extension module="org.jboss.as.naming"/>
+        <extension module="org.jboss.as.remoting"/>
+        <extension module="org.jboss.as.security"/>
+        <extension module="org.jboss.as.transactions"/>
+        <extension module="org.keycloak.keycloak-server-subsystem"/>
+        <extension module="org.wildfly.extension.bean-validation"/>
+        <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.request-controller"/>
+        <extension module="org.wildfly.extension.security.manager"/>
+        <extension module="org.wildfly.extension.undertow"/>
+    </extensions>
+    <management>
+        <security-realms>
+            <security-realm name="ManagementRealm">
+                <authentication>
+                    <local default-user="$local" skip-group-loading="true"/>
+                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization map-groups-to-roles="false">
+                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+            <security-realm name="ApplicationRealm">
+                <authentication>
+                    <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
+                    <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization>
+                    <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+        </security-realms>
+        <audit-log>
+            <formatters>
+                <json-formatter name="json-formatter"/>
+            </formatters>
+            <handlers>
+                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+            </handlers>
+            <logger log-boot="true" log-read-only="false" enabled="false">
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
+            </logger>
+        </audit-log>
+        <management-interfaces>
+            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
+                <socket-binding http="management-http"/>
+            </http-interface>
+        </management-interfaces>
+        <access-control provider="simple">
+            <role-mapping>
+                <role name="SuperUser">
+                    <include>
+                        <user name="$local"/>
+                    </include>
+                </role>
+            </role-mapping>
+        </access-control>
+    </management>
+    <profile>
+        <subsystem xmlns="urn:jboss:domain:logging:3.0">
+            <console-handler name="CONSOLE">
+                <level name="INFO"/>
+                <formatter>
+                    <named-formatter name="COLOR-PATTERN"/>
+                </formatter>
+            </console-handler>
+            <periodic-rotating-file-handler name="FILE" autoflush="true">
+                <formatter>
+                    <named-formatter name="PATTERN"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="server.log"/>
+                <suffix value=".yyyy-MM-dd"/>
+                <append value="true"/>
+            </periodic-rotating-file-handler>
+            <logger category="com.arjuna">
+                <level name="WARN"/>
+            </logger>
+            <logger category="org.jboss.as.config">
+                <level name="DEBUG"/>
+            </logger>
+            <logger category="sun.rmi">
+                <level name="WARN"/>
+            </logger>
+            <root-logger>
+                <level name="INFO"/>
+                <handlers>
+                    <handler name="CONSOLE"/>
+                    <handler name="FILE"/>
+                </handlers>
+            </root-logger>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+            </formatter>
+            <formatter name="COLOR-PATTERN">
+                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+            </formatter>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:datasources:4.0">
+            <datasources>
+                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
+                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
+                    <driver>h2</driver>
+                    <security>
+                        <user-name>sa</user-name>
+                        <password>sa</password>
+                    </security>
+                </datasource>
+                <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
+                    <connection-url>jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE</connection-url>
+                    <driver>h2</driver>
+                    <security>
+                        <user-name>sa</user-name>
+                        <password>sa</password>
+                    </security>
+                </datasource>
+                <drivers>
+                    <driver name="h2" module="com.h2database.h2">
+                        <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+                    </driver>
+                </drivers>
+            </datasources>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ee:4.0">
+            <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+            <concurrent>
+                <context-services>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                </context-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                </managed-thread-factories>
+                <managed-executor-services>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" keepalive-time="5000"/>
+                </managed-executor-services>
+                <managed-scheduled-executor-services>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
+                </managed-scheduled-executor-services>
+            </concurrent>
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
+            <session-bean>
+                <stateless>
+                    <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+                </stateless>
+                <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
+                <singleton default-access-timeout="5000"/>
+            </session-bean>
+            <pools>
+                <bean-instance-pools>
+                    <!-- Automatically configure pools. Alternatively, max-pool-size can be set to a specific value -->
+                    <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                </bean-instance-pools>
+            </pools>
+            <caches>
+                <cache name="simple"/>
+                <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
+            </caches>
+            <passivation-stores>
+                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
+            </passivation-stores>
+            <async thread-pool-name="default"/>
+            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+                <data-stores>
+                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+                </data-stores>
+            </timer-service>
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
+            <thread-pools>
+                <thread-pool name="default">
+                    <max-threads count="10"/>
+                    <keepalive-time time="100" unit="milliseconds"/>
+                </thread-pool>
+            </thread-pools>
+            <default-security-domain value="other"/>
+            <default-missing-method-permissions-deny-access value="true"/>
+            <log-system-exceptions value="true"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:io:1.1">
+            <worker name="default"/>
+            <buffer-pool name="default"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:4.0">
+            <cache-container name="keycloak" jndi-name="infinispan/Keycloak">
+                <local-cache name="realms">
+                    <eviction max-entries="10000" strategy="LRU"/>
+                </local-cache>
+                <local-cache name="users">
+                    <eviction max-entries="10000" strategy="LRU"/>
+                </local-cache>
+                <local-cache name="sessions"/>
+                <local-cache name="authenticationSessions"/>
+                <local-cache name="offlineSessions"/>
+                <local-cache name="loginFailures"/>
+                <local-cache name="work"/>
+                <local-cache name="authorization">
+                    <eviction max-entries="10000" strategy="LRU"/>
+                </local-cache>
+                <local-cache name="keys">
+                    <eviction max-entries="1000" strategy="LRU"/>
+                    <expiration max-idle="3600000"/>
+                </local-cache>
+                <local-cache name="actionTokens">
+                    <eviction max-entries="-1" strategy="NONE"/>
+                    <expiration max-idle="-1" interval="300000"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
+                <local-cache name="default">
+                    <transaction mode="BATCH"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <file-store passivation="true" purge="false"/>
+                </local-cache>
+                <local-cache name="persistent">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <file-store passivation="false" purge="false"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <file-store passivation="true" purge="false"/>
+                </local-cache>
+                <local-cache name="persistent">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <file-store passivation="false" purge="false"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="hibernate" default-cache="local-query" module="org.hibernate.infinispan">
+                <local-cache name="entity">
+                    <transaction mode="NON_XA"/>
+                    <eviction strategy="LRU" max-entries="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="local-query">
+                    <eviction strategy="LRU" max-entries="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="timestamps"/>
+            </cache-container>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jca:4.0">
+            <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
+            <bean-validation enabled="true"/>
+            <default-workmanager>
+                <short-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </short-running-threads>
+                <long-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </long-running-threads>
+            </default-workmanager>
+            <cached-connection-manager/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
+            <expose-resolved-model/>
+            <expose-expression-model/>
+            <remoting-connector/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jpa:1.1">
+            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:mail:2.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
+                <smtp-server outbound-socket-binding-ref="mail-smtp"/>
+            </mail-session>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:naming:2.0">
+            <remote-naming/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:remoting:3.0">
+            <endpoint/>
+            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
+            <deployment-permissions>
+                <maximum-set>
+                    <permission class="java.security.AllPermission"/>
+                </maximum-set>
+            </deployment-permissions>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:security:1.2">
+            <security-domains>
+                <security-domain name="other" cache-type="default">
+                    <authentication>
+                        <login-module code="Remoting" flag="optional">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                        <login-module code="RealmDirect" flag="required">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                    </authentication>
+                </security-domain>
+                <security-domain name="jboss-web-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+                <security-domain name="jboss-ejb-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+                <security-domain name="jaspitest" cache-type="default">
+                    <authentication-jaspi>
+                        <login-module-stack name="dummy">
+                            <login-module code="Dummy" flag="optional"/>
+                        </login-module-stack>
+                        <auth-module code="Dummy"/>
+                    </authentication-jaspi>
+                </security-domain>
+            </security-domains>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:transactions:3.0">
+            <core-environment>
+                <process-id>
+                    <uuid/>
+                </process-id>
+            </core-environment>
+            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:undertow:3.0">
+            <buffer-cache name="default"/>
+            <server name="default-server">
+                <http-listener name="default" socket-binding="http" redirect-socket="https"/>
+                <host name="default-host" alias="localhost">
+                    <location name="/" handler="welcome-content"/>
+                    <filter-ref name="server-header"/>
+                    <filter-ref name="x-powered-by-header"/>
+                </host>
+            </server>
+            <servlet-container name="default">
+                <jsp-config/>
+                <websockets/>
+            </servlet-container>
+            <handlers>
+                <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
+            </handlers>
+            <filters>
+                <response-header name="server-header" header-name="Server" header-value="WildFly/10"/>
+                <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
+            </filters>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:keycloak-server:1.1">
+            <web-context>auth</web-context>
+            <providers>
+                <provider>classpath:${jboss.home.dir}/providers/*</provider>
+            </providers>
+            <master-realm-name>master</master-realm-name>
+            <scheduled-task-interval>900</scheduled-task-interval>
+            <theme>
+                <staticMaxAge>2592000</staticMaxAge>
+                <cacheThemes>true</cacheThemes>
+                <cacheTemplates>true</cacheTemplates>
+                <dir>${jboss.home.dir}/themes</dir>
+            </theme>
+            <spi name="eventsStore">
+                <provider name="jpa" enabled="true">
+                    <properties>
+                        <property name="exclude-events" value="[&quot;REFRESH_TOKEN&quot;]"/>
+                    </properties>
+                </provider>
+            </spi>
+            <spi name="userCache">
+                <provider name="default" enabled="true"/>
+            </spi>
+            <spi name="userSessionPersister">
+                <default-provider>jpa</default-provider>
+            </spi>
+            <spi name="timer">
+                <default-provider>basic</default-provider>
+            </spi>
+            <spi name="connectionsHttpClient">
+                <provider name="default" enabled="true"/>
+            </spi>
+            <spi name="connectionsJpa">
+                <provider name="default" enabled="true">
+                    <properties>
+                        <property name="dataSource" value="java:jboss/datasources/KeycloakDS"/>
+                        <property name="initializeEmpty" value="true"/>
+                        <property name="migrationStrategy" value="update"/>
+                        <property name="migrationExport" value="${jboss.home.dir}/keycloak-database-update.sql"/>
+                    </properties>
+                </provider>
+            </spi>
+            <spi name="realmCache">
+                <provider name="default" enabled="true"/>
+            </spi>
+            <spi name="connectionsInfinispan">
+                <default-provider>default</default-provider>
+                <provider name="default" enabled="true">
+                    <properties>
+                        <property name="cacheContainer" value="java:comp/env/infinispan/Keycloak"/>
+                    </properties>
+                </provider>
+            </spi>
+            <spi name="jta-lookup">
+                <default-provider>${keycloak.jta.lookup.provider:jboss}</default-provider>
+                <provider name="jboss" enabled="true"/>
+            </spi>
+            <spi name="publicKeyStorage">
+                <provider name="infinispan" enabled="true">
+                    <properties>
+                        <property name="minTimeBetweenRequests" value="10"/>
+                    </properties>
+                </provider>
+            </spi>
+        </subsystem>
+    </profile>
+    <interfaces>
+        <interface name="management">
+            <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+        </interface>
+        <interface name="public">
+            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+        </interface>
+    </interfaces>
+    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
+        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
+        <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
+        <socket-binding name="https" port="${jboss.https.port:8443}"/>
+        <socket-binding name="txn-recovery-environment" port="4712"/>
+        <socket-binding name="txn-status-manager" port="4713"/>
+        <outbound-socket-binding name="mail-smtp">
+            <remote-destination host="localhost" port="25"/>
+        </outbound-socket-binding>
+    </socket-binding-group>
+</server>
diff --git a/ansible/roles/keycloak-deploy/defaults/main.yml b/ansible/roles/keycloak-deploy/defaults/main.yml
index b68604449..5bb301b3a 100644
--- a/ansible/roles/keycloak-deploy/defaults/main.yml
+++ b/ansible/roles/keycloak-deploy/defaults/main.yml
@@ -77,6 +77,8 @@ keycloak_custom_ds: '
         </validation>
     </datasource>'
 
+keycloak_heap_size: 512m
+keycloak_metaspace_size: 256m
 theme: "sunrise.tar.gz"
 dest_theme: "/opt/keycloak/themes/"
 theme_file: sunrise
diff --git a/ansible/roles/keycloak-deploy/tasks/deploy.yml b/ansible/roles/keycloak-deploy/tasks/deploy.yml
index a796e2ad1..96236c9df 100644
--- a/ansible/roles/keycloak-deploy/tasks/deploy.yml
+++ b/ansible/roles/keycloak-deploy/tasks/deploy.yml
@@ -1,12 +1,3 @@
-- name: Get the list of all the services running in our OS
-  become: yes
-  service_facts:
-
-- name: Stop the monit to ensure that it doesn't start keycloak
-  service: name=monit state=stopped
-  become: yes
-  when: ansible_facts.services.monit is defined
-
 - name: Status service
   become: true
   command: /etc/init.d/keycloak status
@@ -28,17 +19,26 @@
     line: '{{item.var}}={{item.value}}'
     regexp: "{{ item.var }}.*"
   with_items:
-    - {var: 'sunbird_lms_base_url', value: '{{ sunbird_lms_base_url }}'}
-    - {var: 'sunbird_authorization', value: '{{ sunbird_authorization }}'}
-    - {var: 'sunbird_encryption_key', value: '{{ sunbird_encryption_key }}'}
-    - {var: 'sunbird_sso_username', value: '{{ sunbird_sso_username }}'}
-    - {var: 'sunbird_sso_password', value: '{{ sunbird_sso_password }}'}
-    - {var: 'sunbird_sso_url', value: '{{ keycloak_auth_server_url }}/'}
-    - {var: 'sunbird_sso_realm', value: '{{ keycloak_realm }}'}
-    - {var: 'sunbird_sso_client_id', value: '{{ sunbird_sso_client_id }}'}
-    - {var: 'sunbird_cassandra_host', value: '{{ sunbird_cassandra_host }}'}
     - {var: 'sunbird_user_service_base_url', value: '{{ sunbird_user_service_base_url }}'}
 
+- name: Remove old ENV Vars from environemt file
+  lineinfile:
+    path: '/etc/environment'
+    line: '{{item.var}}'
+    regexp: "{{ item.var }}.*"
+    state: absent
+  with_items:
+    - {var: 'sunbird_lms_base_url'}
+    - {var: 'sunbird_authorization'}
+    - {var: 'sunbird_encryption_key'}
+    - {var: 'sunbird_sso_username'}
+    - {var: 'sunbird_sso_password'}
+    - {var: 'sunbird_sso_url'}
+    - {var: 'sunbird_sso_realm'}
+    - {var: 'sunbird_sso_client_id'}
+    - {var: 'sunbird_cassandra_host'}
+    - {var: 'sunbird_cs_base_url'}
+
 - name: Remove keycloak
   become: true
   file:
@@ -48,24 +48,33 @@
     group: "{{ wildfly_group }}"
     force: true
 
-- name: Creating keycloak directory
-  become: true
-  file:
-    path: "{{ keycloak_home }}"
-    state: directory
+- name: Paste keycloak package on server
+  copy:
+    src: "{{ artifact_path }}"
+    dest: "/opt/"
     owner: "{{ wildfly_user }}"
     group: "{{ wildfly_group }}"
+    force: true
 
 - name: Extarct the folder
   unarchive:
-    src: "{{ artifact_path }}"
-    dest: "{{ keycloak_home }}"
+    src: "/opt/{{ artifact }}"
+    dest: /opt/
+    copy: false
     owner: "{{ wildfly_user }}"
     group: "{{ wildfly_group }}"
 
-- name: Creating keycloak directory in proper structure
-  become: yes
-  shell: "cd {{ keycloak_home }} ; mv sunbird_auth_1.0v/* ./ ; rm -rf sunbird_auth_1.0v; chown -R keycloak:keycloak {{ keycloak_home }}"
+- name: Move the folder name
+  command: mv sunbird_auth_{{ sunbird_auth_version }} keycloak
+  args:
+    chdir: /opt
+
+- name: Remove the opt/{{ artifact }}
+  become: true
+  file:
+    path: "/opt/{{ artifact }}"
+    state: absent
+    force: true
 
 - name: Create required directories
   file:
@@ -109,19 +118,11 @@
     mode: 0755
     force: true
 
-- name: Keycloak configuration XML file - Multi-node keycloak
-  template:
-    src: "standalone-ha.xml"
-    dest: "sunbird_auth_{{ sunbird_auth_version }}.config/standalone-ha.xml"
-    mode: 0750
-  when: groups['keycloak'] | length > 1
-
-- name: Keycloak configuration XML file - Single node keycloak
+- name: Keycloak configuration XML file
   template:
-    src: "standalone-ha-single.xml"
+    src: "roles/keycloak-deploy/templates/standalone-ha.xml"
     dest: "sunbird_auth_{{ sunbird_auth_version }}.config/standalone-ha.xml"
     mode: 0750
-  when: groups['keycloak'] | length < 2
 
 - name: Postgresql Configuration- module.xml
   template:
@@ -137,7 +138,7 @@
   when: "{{ msg_91_required|default(false) }}"
   ignore_errors: true
 
-- name: Keycloak configuration XML file 
+- name: Keycloak configuration XML file
   copy:
     src: "sunbird_auth_{{ sunbird_auth_version }}.config/standalone-ha.xml"
     dest: "{{ keycloak_home }}/standalone/configuration/standalone-ha.xml"
@@ -146,6 +147,14 @@
     group: "{{ wildfly_group }}"
     remote_src: true
 
+- name: Keycloak standalone.conf file
+  template:
+    src: templates/standalone.conf.j2
+    dest: "{{ keycloak_home }}/bin/standalone.conf"
+    owner: "{{ wildfly_user }}"
+    group: "{{ wildfly_group }}"
+    mode: 0755
+
 - name: Postgresql Configuration- module.xml
   copy:
     src: "sunbird_auth_{{ sunbird_auth_version }}.config/module.xml"
@@ -194,12 +203,3 @@
   command: /etc/init.d/keycloak start
   poll: 5
   async: 5
-
-- name: get the list of all services in the system
-  become: yes
-  service_facts:
-
-- name: After succesful migration and staring of keycloak, start back monit if installed
-  service: name=monit state=started
-  become: yes
-  when: ansible_facts.services.monit is defined
diff --git a/ansible/roles/keycloak-deploy/templates/module.xml.j2 b/ansible/roles/keycloak-deploy/templates/module.xml.j2
index fc3c43c66..bcfe36a40 100644
--- a/ansible/roles/keycloak-deploy/templates/module.xml.j2
+++ b/ansible/roles/keycloak-deploy/templates/module.xml.j2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.3" name="org.postgresql">
+<module xmlns="urn:jboss:module:1.1" name="org.postgresql">
     <resources>
         <resource-root path="postgresql-9.4.1212.jar"/>
     </resources>
diff --git a/ansible/roles/keycloak-deploy/templates/standalone-ha.xml b/ansible/roles/keycloak-deploy/templates/standalone-ha.xml
index 14ee65162..d1aac745d 100644
--- a/ansible/roles/keycloak-deploy/templates/standalone-ha.xml
+++ b/ansible/roles/keycloak-deploy/templates/standalone-ha.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:10.0">
+<server xmlns="urn:jboss:domain:4.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.clustering.jgroups"/>
@@ -9,8 +9,10 @@
         <extension module="org.jboss.as.ee"/>
         <extension module="org.jboss.as.ejb3"/>
         <extension module="org.jboss.as.jaxrs"/>
+        <extension module="org.jboss.as.jdr"/>
         <extension module="org.jboss.as.jmx"/>
         <extension module="org.jboss.as.jpa"/>
+        <extension module="org.jboss.as.jsf"/>
         <extension module="org.jboss.as.logging"/>
         <extension module="org.jboss.as.mail"/>
         <extension module="org.jboss.as.modcluster"/>
@@ -20,12 +22,7 @@
         <extension module="org.jboss.as.transactions"/>
         <extension module="org.keycloak.keycloak-server-subsystem"/>
         <extension module="org.wildfly.extension.bean-validation"/>
-        <extension module="org.wildfly.extension.core-management"/>
-        <extension module="org.wildfly.extension.elytron"/>
         <extension module="org.wildfly.extension.io"/>
-        <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
-        <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
-        <extension module="org.wildfly.extension.microprofile.metrics-smallrye"/>
         <extension module="org.wildfly.extension.request-controller"/>
         <extension module="org.wildfly.extension.security.manager"/>
         <extension module="org.wildfly.extension.undertow"/>
@@ -42,11 +39,6 @@
                 </authorization>
             </security-realm>
             <security-realm name="ApplicationRealm">
-                <server-identities>
-                    <ssl>
-                        <keystore path="application.keystore" relative-to="jboss.server.config.dir" keystore-password="password" alias="server" key-password="password" generate-self-signed-certificate-host="localhost"/>
-                    </ssl>
-                </server-identities>
                 <authentication>
                     <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
                     <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
@@ -61,7 +53,7 @@
                 <json-formatter name="json-formatter"/>
             </formatters>
             <handlers>
-                <file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
+                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
             </handlers>
             <logger log-boot="true" log-read-only="false" enabled="false">
                 <handlers>
@@ -70,8 +62,7 @@
             </logger>
         </audit-log>
         <management-interfaces>
-            <http-interface security-realm="ManagementRealm">
-                <http-upgrade enabled="true"/>
+            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
                 <socket-binding http="management-http"/>
             </http-interface>
         </management-interfaces>
@@ -86,7 +77,7 @@
         </access-control>
     </management>
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:6.0">
+        <subsystem xmlns="urn:jboss:domain:logging:3.0">
             <console-handler name="CONSOLE">
                 <level name="INFO"/>
                 <formatter>
@@ -101,12 +92,20 @@
                 <suffix value=".yyyy-MM-dd"/>
                 <append value="true"/>
             </periodic-rotating-file-handler>
+            <syslog-handler name="SYSLOG" enabled="true">
+                <app-name value="keycloak"/>
+                <facility value="local-use-7"/>
+                <formatter>
+                    <syslog-format syslog-type="RFC5424"/>
+                </formatter>
+                <hostname value="${jboss.host.name}"/>
+                <level name="INFO"/>
+                <server-address value="0.0.0.0"/>
+                <port value="514"/>
+            </syslog-handler>
             <logger category="com.arjuna">
                 <level name="WARN"/>
             </logger>
-            <logger category="io.jaegertracing.Configuration">
-                <level name="WARN"/>
-            </logger>
             <logger category="org.jboss.as.config">
                 <level name="DEBUG"/>
             </logger>
@@ -118,6 +117,7 @@
                 <handlers>
                     <handler name="CONSOLE"/>
                     <handler name="FILE"/>
+                    <handler name="SYSLOG"/>
                 </handlers>
             </root-logger>
             <formatter name="PATTERN">
@@ -128,10 +128,9 @@
             </formatter>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:datasources:5.0">
+        <subsystem xmlns="urn:jboss:domain:datasources:4.0">
             <datasources>
-                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
+                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
                     <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
                     <driver>h2</driver>
                     <security>
@@ -139,25 +138,41 @@
                         <password>sa</password>
                     </security>
                 </datasource>
-                <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
+                <datasource jndi-name="java:jboss/datasources/KeycloakOrigDS" pool-name="KeycloakOrigDS" enabled="false" use-java-context="true">
+                    <connection-url>jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE</connection-url>
+                    <driver>h2</driver>
+                    <security>
+                        <user-name>sa</user-name>
+                        <password>sa</password>
+                    </security>
+                </datasource>
+                <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
+                    <!-- Require both connection-url and connection-property[name="url"]
+                         This is because of a Wildfly issue. Since the postgres driver is using a
+                         datasource-class the connection parameters have to be set via
+                         <connection-property>. However, deleting <connection-url> causes a Wildfly
+                         configuration parsing error
+
+                         See this issue for detail: https://issues.jboss.org/browse/WFLY-6157
+                         It is fixed for Wildfly 11.0.0.Alpha1
+                    -->
+                    <connection-url>jdbc:postgresql://thisnotwork:5432/keycloak</connection-url>
                     <connection-property name="url">jdbc:postgresql://{{keycloak_postgres_host}}:5432/{{ keycloak_postgres_database }}?sslmode=require</connection-property>
                     <driver>postgresql</driver>
+                    <pool>
+                        <max-pool-size>50</max-pool-size>
+                    </pool>
                     <security>
                         <user-name>{{ keycloak_postgres_user }}</user-name>
                         <password>{{ keycloak_postgres_password }}</password>
                     </security>
-
-                <validation>
-                      <check-valid-connection-sql>select 1</check-valid-connection-sql>
-                      <validate-on-match>false</validate-on-match>
-                      <background-validation>true</background-validation>
-                      <background-validation-millis>120000</background-validation-millis>
-                </validation>
-                <statement>
-                      <share-prepared-statements>false</share-prepared-statements>
-                </statement>
+                    <validation>
+                        <background-validation>true</background-validation>
+                        <background-validation-millis>10000</background-validation-millis>
+                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"/>
+                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter"/>
+                    </validation>
                 </datasource>
-
                 <drivers>
                     <driver name="h2" module="com.h2database.h2">
                         <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
@@ -190,7 +205,7 @@
             </concurrent>
             <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ejb3:5.0">
+        <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
             <session-bean>
                 <stateless>
                     <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
@@ -200,8 +215,9 @@
             </session-bean>
             <pools>
                 <bean-instance-pools>
-                    <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <!-- Automatically configure pools. Alternatively, max-pool-size can be set to a specific value -->
                     <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
                 </bean-instance-pools>
             </pools>
             <caches>
@@ -217,12 +233,7 @@
                     <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
                 </data-stores>
             </timer-service>
-            <remote connector-ref="http-remoting-connector" thread-pool-name="default">
-                <channel-creation-options>
-                    <option name="READ_TIMEOUT" value="${prop.remoting-connector.read.timeout:20}" type="xnio"/>
-                    <option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
-                </channel-creation-options>
-            </remote>
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
             <thread-pools>
                 <thread-pool name="default">
                     <max-threads count="10"/>
@@ -231,50 +242,47 @@
             </thread-pools>
             <default-security-domain value="other"/>
             <default-missing-method-permissions-deny-access value="true"/>
-            <statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
             <log-system-exceptions value="true"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:io:3.0">
+        <subsystem xmlns="urn:jboss:domain:io:1.1">
             <worker name="default"/>
             <buffer-pool name="default"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:8.0">
-            <cache-container name="keycloak" >
+        <subsystem xmlns="urn:jboss:domain:infinispan:4.0">
+            <cache-container name="keycloak" jndi-name="infinispan/Keycloak">
                 <transport lock-timeout="60000"/>
                 <local-cache name="realms">
-                    <object-memory size="10000"/>
+                    <eviction max-entries="10000" strategy="LRU"/>
                 </local-cache>
                 <local-cache name="users">
-                    <object-memory size="10000"/>
+                    <eviction max-entries="10000" strategy="LRU"/>
                 </local-cache>
-                <distributed-cache name="sessions" owners="1"/>
-                <distributed-cache name="authenticationSessions" owners="1"/>
-                <distributed-cache name="offlineSessions" owners="1"/>
-                <distributed-cache name="clientSessions" owners="1"/>
-                <distributed-cache name="offlineClientSessions" owners="1"/>
-                <distributed-cache name="loginFailures" owners="1"/>
+                <distributed-cache name="sessions" mode="SYNC" owners="1"/>
+                <distributed-cache name="authenticationSessions" mode="SYNC" owners="1"/>
+                <distributed-cache name="offlineSessions" mode="SYNC" owners="1"/>
+                <distributed-cache name="loginFailures" mode="SYNC" owners="1"/>
                 <local-cache name="authorization">
-                    <object-memory size="10000"/>
+                    <eviction max-entries="10000" strategy="LRU"/>
                 </local-cache>
-                <replicated-cache name="work"/>
+                <replicated-cache name="work" mode="SYNC"/>
                 <local-cache name="keys">
-                    <object-memory size="1000"/>
+                    <eviction max-entries="1000" strategy="LRU"/>
                     <expiration max-idle="3600000"/>
                 </local-cache>
-                <distributed-cache name="actionTokens" owners="2">
-                    <object-memory size="-1"/>
+                <distributed-cache name="actionTokens" mode="SYNC" owners="2">
+                    <eviction max-entries="-1" strategy="NONE"/>
                     <expiration max-idle="-1" interval="300000"/>
                 </distributed-cache>
             </cache-container>
             <cache-container name="server" aliases="singleton cluster" default-cache="default" module="org.wildfly.clustering.server">
                 <transport lock-timeout="60000"/>
-                <replicated-cache name="default">
+                <replicated-cache name="default" mode="SYNC">
                     <transaction mode="BATCH"/>
                 </replicated-cache>
             </cache-container>
             <cache-container name="web" default-cache="dist" module="org.wildfly.clustering.web.infinispan">
                 <transport lock-timeout="60000"/>
-                <distributed-cache name="dist">
+                <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
                     <locking isolation="REPEATABLE_READ"/>
                     <transaction mode="BATCH"/>
                     <file-store/>
@@ -282,28 +290,28 @@
             </cache-container>
             <cache-container name="ejb" aliases="sfsb" default-cache="dist" module="org.wildfly.clustering.ejb.infinispan">
                 <transport lock-timeout="60000"/>
-                <distributed-cache name="dist">
+                <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
                     <locking isolation="REPEATABLE_READ"/>
                     <transaction mode="BATCH"/>
                     <file-store/>
                 </distributed-cache>
             </cache-container>
-            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
+            <cache-container name="hibernate" default-cache="local-query" module="org.hibernate.infinispan">
                 <transport lock-timeout="60000"/>
                 <local-cache name="local-query">
-                    <object-memory size="10000"/>
+                    <eviction strategy="LRU" max-entries="10000"/>
                     <expiration max-idle="100000"/>
                 </local-cache>
-                <invalidation-cache name="entity">
+                <invalidation-cache name="entity" mode="SYNC">
                     <transaction mode="NON_XA"/>
-                    <object-memory size="10000"/>
+                    <eviction strategy="LRU" max-entries="10000"/>
                     <expiration max-idle="100000"/>
                 </invalidation-cache>
-                <replicated-cache name="timestamps"/>
+                <replicated-cache name="timestamps" mode="ASYNC"/>
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:5.0">
+        <subsystem xmlns="urn:jboss:domain:jca:4.0">
             <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
             <bean-validation enabled="true"/>
             <default-workmanager>
@@ -322,7 +330,8 @@
             </default-workmanager>
             <cached-connection-manager/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jgroups:6.0">
+        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jgroups:4.0">
             <channels default="ee">
                 <channel name="ee" stack="tcp"/>
             </channels>
@@ -331,7 +340,7 @@
                     <transport type="UDP" socket-binding="jgroups-udp"/>
                     <protocol type="PING"/>
                     <protocol type="MERGE3"/>
-                    <protocol type="FD_SOCK"/>
+                    <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/>
                     <protocol type="FD_ALL"/>
                     <protocol type="VERIFY_SUSPECT"/>
                     <protocol type="pbcast.NAKACK2"/>
@@ -340,15 +349,18 @@
                     <protocol type="pbcast.GMS"/>
                     <protocol type="UFC"/>
                     <protocol type="MFC"/>
-                    <protocol type="FRAG3"/>
+                    <protocol type="FRAG2"/>
                 </stack>
-
-            <stack name="tcp">
+                <stack name="tcp">
                     <transport type="TCP" socket-binding="jgroups-tcp"/>
                     <protocol type="TCPPING">
-                        <property name="initial_hosts">{{groups['keycloak'] | difference(ansible_default_ipv4.address) | join('[7600],')}}[7600]</property>
+                        <property name="initial_hosts">{{groups['keycloak']|join('[7600],')}}[7600]
+                        </property>
                         <property name="port_range">10</property>
+                        <property name="timeout">3000</property>
+                        <property name="num_initial_members">2</property>
                     </protocol>
+<!--                    <protocol type="MPING" socket-binding="jgroups-mping"/> -->
                     <protocol type="MERGE3"/>
                     <protocol type="FD_SOCK" socket-binding="jgroups-tcp-fd"/>
                     <protocol type="FD"/>
@@ -360,7 +372,6 @@
                     <protocol type="MFC"/>
                     <protocol type="FRAG2"/>
                 </stack>
-
             </stacks>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jmx:1.3">
@@ -371,22 +382,24 @@
         <subsystem xmlns="urn:jboss:domain:jpa:1.1">
             <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:mail:3.0">
+        <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:mail:2.0">
             <mail-session name="default" jndi-name="java:jboss/mail/Default">
                 <smtp-server outbound-socket-binding-ref="mail-smtp"/>
             </mail-session>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:modcluster:5.0">
-            <proxy name="default" advertise-socket="modcluster" listener="ajp">
+        <subsystem xmlns="urn:jboss:domain:modcluster:2.0">
+            <mod-cluster-config advertise-socket="modcluster" connector="ajp">
                 <dynamic-load-provider>
                     <load-metric type="cpu"/>
                 </dynamic-load-provider>
-            </proxy>
+            </mod-cluster-config>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <remote-naming/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:remoting:4.0">
+        <subsystem xmlns="urn:jboss:domain:remoting:3.0">
+            <endpoint/>
             <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
@@ -397,107 +410,7 @@
                 </maximum-set>
             </deployment-permissions>
         </subsystem>
-        <subsystem xmlns="urn:wildfly:elytron:6.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
-            <providers>
-                <aggregate-providers name="combined-providers">
-                    <providers name="elytron"/>
-                    <providers name="openssl"/>
-                </aggregate-providers>
-                <provider-loader name="elytron" module="org.wildfly.security.elytron"/>
-                <provider-loader name="openssl" module="org.wildfly.openssl"/>
-            </providers>
-            <audit-logging>
-                <file-audit-log name="local-audit" path="audit.log" relative-to="jboss.server.log.dir" format="JSON"/>
-            </audit-logging>
-            <security-domains>
-                <security-domain name="ApplicationDomain" default-realm="ApplicationRealm" permission-mapper="default-permission-mapper">
-                    <realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
-                    <realm name="local"/>
-                </security-domain>
-                <security-domain name="ManagementDomain" default-realm="ManagementRealm" permission-mapper="default-permission-mapper">
-                    <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
-                    <realm name="local" role-mapper="super-user-mapper"/>
-                </security-domain>
-            </security-domains>
-            <security-realms>
-                <identity-realm name="local" identity="$local"/>
-                <properties-realm name="ApplicationRealm">
-                    <users-properties path="application-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ApplicationRealm"/>
-                    <groups-properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
-                </properties-realm>
-                <properties-realm name="ManagementRealm">
-                    <users-properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ManagementRealm"/>
-                    <groups-properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
-                </properties-realm>
-            </security-realms>
-            <mappers>
-                <simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
-                    <permission-mapping>
-                        <principal name="anonymous"/>
-                        <permission-set name="default-permissions"/>
-                    </permission-mapping>
-                    <permission-mapping match-all="true">
-                        <permission-set name="login-permission"/>
-                        <permission-set name="default-permissions"/>
-                    </permission-mapping>
-                </simple-permission-mapper>
-                <constant-realm-mapper name="local" realm-name="local"/>
-                <simple-role-decoder name="groups-to-roles" attribute="groups"/>
-                <constant-role-mapper name="super-user-mapper">
-                    <role name="SuperUser"/>
-                </constant-role-mapper>
-            </mappers>
-            <permission-sets>
-                <permission-set name="login-permission">
-                    <permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
-                </permission-set>
-                <permission-set name="default-permissions">
-                    <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission" module="org.wildfly.extension.batch.jberet" target-name="*"/>
-                    <permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission" module="org.wildfly.transaction.client"/>
-                    <permission class-name="org.jboss.ejb.client.RemoteEJBPermission" module="org.jboss.ejb-client"/>
-                </permission-set>
-            </permission-sets>
-            <http>
-                <http-authentication-factory name="management-http-authentication" security-domain="ManagementDomain" http-server-mechanism-factory="global">
-                    <mechanism-configuration>
-                        <mechanism mechanism-name="DIGEST">
-                            <mechanism-realm realm-name="ManagementRealm"/>
-                        </mechanism>
-                    </mechanism-configuration>
-                </http-authentication-factory>
-                <provider-http-server-mechanism-factory name="global"/>
-            </http>
-            <sasl>
-                <sasl-authentication-factory name="application-sasl-authentication" sasl-server-factory="configured" security-domain="ApplicationDomain">
-                    <mechanism-configuration>
-                        <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
-                        <mechanism mechanism-name="DIGEST-MD5">
-                            <mechanism-realm realm-name="ApplicationRealm"/>
-                        </mechanism>
-                    </mechanism-configuration>
-                </sasl-authentication-factory>
-                <sasl-authentication-factory name="management-sasl-authentication" sasl-server-factory="configured" security-domain="ManagementDomain">
-                    <mechanism-configuration>
-                        <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
-                        <mechanism mechanism-name="DIGEST-MD5">
-                            <mechanism-realm realm-name="ManagementRealm"/>
-                        </mechanism>
-                    </mechanism-configuration>
-                </sasl-authentication-factory>
-                <configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
-                    <properties>
-                        <property name="wildfly.sasl.local-user.default-user" value="$local"/>
-                    </properties>
-                </configurable-sasl-server-factory>
-                <mechanism-provider-filtering-sasl-server-factory name="elytron" sasl-server-factory="global">
-                    <filters>
-                        <filter provider-name="WildFlyElytron"/>
-                    </filters>
-                </mechanism-provider-filtering-sasl-server-factory>
-                <provider-sasl-server-factory name="global"/>
-            </sasl>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:security:2.0">
+        <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
                 <security-domain name="other" cache-type="default">
                     <authentication>
@@ -514,6 +427,11 @@
                         <policy-module code="Delegating" flag="required"/>
                     </authorization>
                 </security-domain>
+                <security-domain name="jboss-ejb-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
                 <security-domain name="jaspitest" cache-type="default">
                     <authentication-jaspi>
                         <login-module-stack name="dummy">
@@ -522,35 +440,25 @@
                         <auth-module code="Dummy"/>
                     </authentication-jaspi>
                 </security-domain>
-                <security-domain name="jboss-ejb-policy" cache-type="default">
-                    <authorization>
-                        <policy-module code="Delegating" flag="required"/>
-                    </authorization>
-                </security-domain>
             </security-domains>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:transactions:5.0">
-            <core-environment node-identifier="${jboss.tx.node.id:1}">
+        <subsystem xmlns="urn:jboss:domain:transactions:3.0">
+            <core-environment>
                 <process-id>
                     <uuid/>
                 </process-id>
             </core-environment>
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
-            <coordinator-environment statistics-enabled="${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
-            <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
         </subsystem>
-        <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>
-        <subsystem xmlns="urn:wildfly:microprofile-health-smallrye:1.0" security-enabled="false"/>
-        <subsystem xmlns="urn:wildfly:microprofile-metrics-smallrye:2.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:wildfly}"/>
-        <subsystem xmlns="urn:jboss:domain:undertow:8.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other" statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
+        <subsystem xmlns="urn:jboss:domain:undertow:3.0">
             <buffer-cache name="default"/>
             <server name="default-server">
                 <ajp-listener name="ajp" socket-binding="ajp"/>
-                <http-listener name="default" socket-binding="http" proxy-address-forwarding="true" redirect-socket="https" enable-http2="true"/>
-                <https-listener name="https" socket-binding="https" security-realm="ApplicationRealm" enable-http2="true"/>
+                <http-listener name="default" socket-binding="http" redirect-socket="https" proxy-address-forwarding="true"/>
                 <host name="default-host" alias="localhost">
                     <location name="/" handler="welcome-content"/>
-                    <http-invoker security-realm="ApplicationRealm"/>
+                    <filter-ref name="server-header"/>
+                    <filter-ref name="x-powered-by-header"/>
                 </host>
             </server>
             <servlet-container name="default">
@@ -560,6 +468,10 @@
             <handlers>
                 <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
             </handlers>
+            <filters>
+                <response-header name="server-header" header-name="Server" header-value="WildFly/10"/>
+                <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
+            </filters>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:keycloak-server:1.1">
             <web-context>auth</web-context>
@@ -610,7 +522,7 @@
                 <default-provider>default</default-provider>
                 <provider name="default" enabled="true">
                     <properties>
-                        <property name="cacheContainer" value="java:jboss/infinispan/container/keycloak"/>
+                        <property name="cacheContainer" value="java:comp/env/infinispan/Keycloak"/>
                     </properties>
                 </provider>
             </spi>
@@ -625,20 +537,6 @@
                     </properties>
                 </provider>
             </spi>
-            <spi name="x509cert-lookup">
-                <default-provider>${keycloak.x509cert.lookup.provider:default}</default-provider>
-                <provider name="default" enabled="true"/>
-            </spi>
-            <spi name="hostname">
-                <default-provider>request</default-provider>
-                <provider name="fixed" enabled="true">
-                    <properties>
-                        <property name="hostname" value="localhost"/>
-                        <property name="httpPort" value="-1"/>
-                        <property name="httpsPort" value="-1"/>
-                    </properties>
-                </provider>
-            </spi>
         </subsystem>
     </profile>
     <interfaces>
@@ -658,12 +556,12 @@
         <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
         <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="${jboss.https.port:8443}"/>
-        <socket-binding name="jgroups-mping" interface="private" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
-          <socket-binding name="jgroups-tcp" interface="private" port="7600"/>
-          <socket-binding name="jgroups-tcp-fd" interface="private" port="57600"/>
-          <socket-binding name="jgroups-udp-fd" interface="private" port="54200"/>
+        <socket-binding name="jgroups-mping" interface="private" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
+        <socket-binding name="jgroups-tcp" interface="private" port="7600"/>
+        <socket-binding name="jgroups-tcp-fd" interface="private" port="57600"/>
         <socket-binding name="jgroups-udp" interface="private" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
-        <socket-binding name="modcluster" multicast-address="${jboss.modcluster.multicast.address:224.0.1.105}" multicast-port="23364"/>
+        <socket-binding name="jgroups-udp-fd" interface="private" port="54200"/>
+        <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
         <socket-binding name="txn-status-manager" port="4713"/>
         <outbound-socket-binding name="mail-smtp">
diff --git a/ansible/roles/keycloak-deploy/templates/standalone.conf.j2 b/ansible/roles/keycloak-deploy/templates/standalone.conf.j2
new file mode 100644
index 000000000..cb64ec9b5
--- /dev/null
+++ b/ansible/roles/keycloak-deploy/templates/standalone.conf.j2
@@ -0,0 +1,73 @@
+## -*- shell-script -*- ######################################################
+##                                                                          ##
+##  JBoss Bootstrap Script Configuration                                    ##
+##                                                                          ##
+##############################################################################
+
+#
+# This file is optional; it may be removed if not needed.
+#
+
+#
+# Specify the maximum file descriptor limit, use "max" or "maximum" to use
+# the default, as queried by the system.
+#
+# Defaults to "maximum"
+#
+#MAX_FD="maximum"
+
+#
+# Specify the profiler configuration file to load.
+#
+# Default is to not load profiler configuration file.
+#
+#PROFILER=""
+
+#
+# Specify the location of the Java home directory.  If set then $JAVA will
+# be defined to $JAVA_HOME/bin/java, else $JAVA will be "java".
+#
+#JAVA_HOME="/opt/java/jdk"
+
+#
+# Specify the exact Java VM executable to use.
+#
+#JAVA=""
+
+if [ "x$JBOSS_MODULES_SYSTEM_PKGS" = "x" ]; then
+   JBOSS_MODULES_SYSTEM_PKGS="org.jboss.byteman"
+fi
+
+# Uncomment the following line to prevent manipulation of JVM options
+# by shell scripts.
+#
+#PRESERVE_JAVA_OPTS=true
+
+#
+# Specify options to pass to the Java VM.
+#
+if [ "x$JAVA_OPTS" = "x" ]; then
+   JAVA_OPTS="-Xms64m -Xmx{{ keycloak_heap_size }} -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize={{ keycloak_metaspace_size }} -Djava.net.preferIPv4Stack=true"
+   JAVA_OPTS="$JAVA_OPTS -Djboss.modules.system.pkgs=$JBOSS_MODULES_SYSTEM_PKGS -Djava.awt.headless=true"
+else
+   echo "JAVA_OPTS already set in environment; overriding default settings with values: $JAVA_OPTS"
+fi
+
+# Sample JPDA settings for remote socket debugging
+#JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n"
+
+# Sample JPDA settings for shared memory debugging
+#JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_shmem,server=y,suspend=n,address=jboss"
+
+# Uncomment to not use JBoss Modules lockless mode
+#JAVA_OPTS="$JAVA_OPTS -Djboss.modules.lockless=false"
+
+# Uncomment to gather JBoss Modules metrics
+#JAVA_OPTS="$JAVA_OPTS -Djboss.modules.metrics=true"
+
+# Uncomment this to run with a security manager enabled
+# SECMGR="true"
+
+# Uncomment this in order to be able to run WildFly on FreeBSD
+# when you get "epoll_create function not implemented" message in dmesg output
+#JAVA_OPTS="$JAVA_OPTS -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.PollSelectorProvider"

From 8887ef67bd962b235d8f67bf3e7fcf077f574ad7 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Fri, 11 Dec 2020 20:24:45 +0530
Subject: [PATCH 069/184] feat: TG-713 KMW offline keys, updated few var names
 (#2071)

---
 .../roles/sunbird-deploy/tasks/main.yml       |  4 ++--
 .../core/groups/templates/deployment.yaml     |  2 +-
 kubernetes/helm_charts/core/groups/values.j2  |  2 +-
 .../core/knowledgemw/templates/configmap.yaml | 22 +++++++++----------
 .../knowledgemw/templates/deployment.yaml     | 11 +++++++++-
 .../helm_charts/core/knowledgemw/values.j2    |  2 ++
 .../core/learner/templates/deployment.yaml    |  2 +-
 kubernetes/helm_charts/core/learner/values.j2 |  2 +-
 .../core/lms/templates/deployment.yaml        |  2 +-
 kubernetes/helm_charts/core/lms/values.j2     |  2 +-
 10 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml b/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
index 9a46ad013..6726d3b8d 100644
--- a/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
+++ b/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
@@ -27,7 +27,7 @@
     private_key_prefix: "{{ outer_item.0.values_to_pass.keyprefix }}"
     private_key_sign_start: "{{ outer_item.0.values_to_pass.keystart }}"
     private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '1'  }}"
-  when: release_name == "learner" or release_name == "lms" or release_name == "groups"
+  when: release_name == "learner" or release_name == "lms" or release_name == "groups" or release_name == "knowledgemw"
   with_subelements:
     - "{{adminutil_access_values}}"
     - role_to_run
@@ -38,7 +38,7 @@
   copy:
     dest: "{{ chart_path }}/keys/{{ adminutil_refresh_token_public_key_kid }}"
     content: "{{ core_vault_sunbird_sso_publickey }}"
-  when: release_name == "learner" or release_name == "lms" or release_name == "groups"
+  when: release_name == "learner" or release_name == "lms" or release_name == "groups" or release_name == "knowledgemw"
 
 - name: helm upgrade
   shell: helm upgrade --install --atomic --timeout {{helm_install_timeout | d('10m')}} {{ release_name }} {{ chart_path }} -n {{namespace}}
diff --git a/kubernetes/helm_charts/core/groups/templates/deployment.yaml b/kubernetes/helm_charts/core/groups/templates/deployment.yaml
index 3f12a3346..8ece35318 100644
--- a/kubernetes/helm_charts/core/groups/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/groups/templates/deployment.yaml
@@ -47,7 +47,7 @@ spec:
 {{- $keys := .Files.Glob "keys/*" }}
 {{- if $keys }}
         volumeMounts:
-        - mountPath: {{ .Values.groups_device_basepath }}
+        - mountPath: {{ .Values.groups_access_basepath }}
           name: access-keys
       volumes:
       - name: access-keys
diff --git a/kubernetes/helm_charts/core/groups/values.j2 b/kubernetes/helm_charts/core/groups/values.j2
index 43f1928a6..3a717743d 100644
--- a/kubernetes/helm_charts/core/groups/values.j2
+++ b/kubernetes/helm_charts/core/groups/values.j2
@@ -28,4 +28,4 @@ strategy:
 
 {{ groups_liveness_readiness | to_nice_yaml }}
 
-groups_device_basepath: {{ groups_device_basepath | default('/keys/') }}
+groups_access_basepath: {{ groups_access_basepath | default('/keys/') }}
diff --git a/kubernetes/helm_charts/core/knowledgemw/templates/configmap.yaml b/kubernetes/helm_charts/core/knowledgemw/templates/configmap.yaml
index eb2c944f4..2575710a0 100644
--- a/kubernetes/helm_charts/core/knowledgemw/templates/configmap.yaml
+++ b/kubernetes/helm_charts/core/knowledgemw/templates/configmap.yaml
@@ -1,11 +1,11 @@
-#apiVersion: v1
-#data:
-#  {{- range $key, $val := .Values.knowledgemwenv }}
-#  {{ $key }}: {{ $val }}
-#  {{- end }}
-#  sunbird_cassandra_replication_strategy: {{ .Values.sunbird_cassandra_replication_strategy | toJson }}
-#kind: ConfigMap
-#metadata:
-#  creationTimestamp: null
-#  name: {{ .Chart.Name }}-config
-#  namespace: {{ .Values.namespace }}
\ No newline at end of file
+---
+{{- $keys := .Files.Glob "keys/*" }}
+{{ if $keys }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: knowledgemw-access-keys
+type: Opaque
+data:
+{{ (.Files.Glob "keys/*").AsSecrets | indent 2 }}
+{{ end }}
diff --git a/kubernetes/helm_charts/core/knowledgemw/templates/deployment.yaml b/kubernetes/helm_charts/core/knowledgemw/templates/deployment.yaml
index 78442e62a..b6a5b5606 100644
--- a/kubernetes/helm_charts/core/knowledgemw/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/knowledgemw/templates/deployment.yaml
@@ -41,7 +41,16 @@ spec:
         readinessProbe:
 {{ toYaml .Values.readinessProbe | indent 10 }}
         {{- end }}
-
+{{- $keys := .Files.Glob "keys/*" }}
+{{- if $keys }}
+        volumeMounts:
+        - mountPath: {{ .Values.knowledgemw_access_basepath }}
+          name: access-keys
+      volumes:
+      - name: access-keys
+        secret:
+          secretName: knowledgemw-access-keys
+{{- end }}
 ---
 apiVersion: v1
 kind: Service
diff --git a/kubernetes/helm_charts/core/knowledgemw/values.j2 b/kubernetes/helm_charts/core/knowledgemw/values.j2
index bf6ae52c1..3d33b267f 100644
--- a/kubernetes/helm_charts/core/knowledgemw/values.j2
+++ b/kubernetes/helm_charts/core/knowledgemw/values.j2
@@ -23,3 +23,5 @@ strategy:
   maxunavailable: {{ knowledge_mw_maxunavailable|default('25%') }}
 
 {{ knowledgemw_liveness_readiness | to_nice_yaml }}
+
+knowledgemw_access_basepath: {{ knowledgemw_access_basepath | default('/home/sunbird/mw/content/keys/') }}
diff --git a/kubernetes/helm_charts/core/learner/templates/deployment.yaml b/kubernetes/helm_charts/core/learner/templates/deployment.yaml
index 81117a28f..54fe996d6 100644
--- a/kubernetes/helm_charts/core/learner/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/learner/templates/deployment.yaml
@@ -50,7 +50,7 @@ spec:
           subPath: learner-service_logback.xml
 {{- $keys := .Files.Glob "keys/*" }}
 {{- if $keys }}
-        - mountPath: {{ .Values.learner_device_basepath }}
+        - mountPath: {{ .Values.learner_access_basepath }}
           name: access-keys
 {{- end }}
       volumes:
diff --git a/kubernetes/helm_charts/core/learner/values.j2 b/kubernetes/helm_charts/core/learner/values.j2
index 0faa781ea..8b897f2a1 100644
--- a/kubernetes/helm_charts/core/learner/values.j2
+++ b/kubernetes/helm_charts/core/learner/values.j2
@@ -28,4 +28,4 @@ strategy:
 
 {{ learner_liveness_readiness | to_nice_yaml }}
 
-learner_device_basepath: {{ learner_device_basepath | default('/keys/') }}
+learner_access_basepath: {{ learner_access_basepath | default('/keys/') }}
diff --git a/kubernetes/helm_charts/core/lms/templates/deployment.yaml b/kubernetes/helm_charts/core/lms/templates/deployment.yaml
index 1c797c37e..f90d2b642 100644
--- a/kubernetes/helm_charts/core/lms/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/lms/templates/deployment.yaml
@@ -54,7 +54,7 @@ spec:
           subPath: lms-service_logback.xml
 {{- $keys := .Files.Glob "keys/*" }}
 {{- if $keys }}
-        - mountPath: {{ .Values.lms_device_basepath }}
+        - mountPath: {{ .Values.lms_access_basepath }}
           name: access-keys
 {{- end }}
       volumes:
diff --git a/kubernetes/helm_charts/core/lms/values.j2 b/kubernetes/helm_charts/core/lms/values.j2
index 0714daad9..dfbfd9a43 100644
--- a/kubernetes/helm_charts/core/lms/values.j2
+++ b/kubernetes/helm_charts/core/lms/values.j2
@@ -28,4 +28,4 @@ strategy:
 
 {{ lms_liveness_readiness | to_nice_yaml }}
 
-lms_device_basepath: {{ lms_device_basepath | default('/keys/') }}
+lms_access_basepath: {{ lms_access_basepath | default('/keys/') }}

From 8582714d64885e90e3123dcaee6fc57352b5ea12 Mon Sep 17 00:00:00 2001
From: Pradyumna <pradyumnan@ilimi.in>
Date: Tue, 15 Dec 2020 13:26:11 +0530
Subject: [PATCH 070/184] LMS config update to
 sunbird_user_service_api_base_url (#2090)

* LMS config update to sunbird_user_service_api_base_url
---
 ansible/roles/stack-sunbird/templates/sunbird_lms-service.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
index 42859c390..700b8be36 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
@@ -100,7 +100,7 @@ sunbird_cache_enable={{sunbird_cache_enable | default(false)}}
 # Set below variables if above true
 sunbird_redis_host={{sunbird_redis_host}}
 sunbird_redis_port={{sunbird_redis_port|default(6379)}}
-sunbird_user_org_api_base_url=http://learner-service:9000
+sunbird_user_org_api_base_url={{ lms_learner_api_base_url | default('http://learner-service:9000') }}
 
 kafka_topics_instruction={{kafka_topics_instruction}}
 kafka_urls={{kafka_urls}}
@@ -112,7 +112,7 @@ sunbird_cert_service_base_url=http://cert-service:9000
 
 learning_service_base_url={{sunbird_content_repo_api_base_url}}
 sunbird_user_search_cretordetails_fields=id,firstName,lastName
-sunbird_user_service_api_base_url={{sunbird_user_service_api_base_url}}
+sunbird_user_service_api_base_url={{ lms_learner_api_base_url | default('http://learner-service:9000') }}
 
 limit_managed_user_creation={{limit_managed_user_creation | default(true)}}
 managed_user_limit={{managed_user_limit | default(30)}}

From 9de55587ef7e6075593c9378ccc06cb8d73a0a2a Mon Sep 17 00:00:00 2001
From: RevathiKotla <45757421+RevathiKotla@users.noreply.github.com>
Date: Tue, 15 Dec 2020 16:53:55 +0530
Subject: [PATCH 071/184] TG-663 : Reliability of hd insight cluster- convert
 cluster ambari metrics to promethus and set alerts (#2053)

* TG-663: Reliability hd cluster metrics
---
 .../Dockerfile                                |  10 +
 .../Jenkinsfile                               |  50 +++
 .../azure-ambari-prometheus-exporter/build.sh |   8 +
 .../collector.py                              | 294 ++++++++++++++++++
 .../components.yaml                           |  27 ++
 .../metadata.sh                               |   3 +
 .../requirements.txt                          |   4 +
 .../azure-ambari-prometheus-exporter.yaml     |  19 ++
 .../.helmignore                               |  23 ++
 .../Chart.yaml                                |  21 ++
 .../templates/_helpers.tpl                    |  63 ++++
 .../templates/alerRules.yaml                  |  30 ++
 .../templates/deployment.yaml                 |  46 +++
 .../templates/service.yaml                    |  16 +
 .../templates/serviceMonitor.yaml             |  22 ++
 .../values.yaml                               |  41 +++
 16 files changed, 677 insertions(+)
 create mode 100644 images/azure-ambari-prometheus-exporter/Dockerfile
 create mode 100644 images/azure-ambari-prometheus-exporter/Jenkinsfile
 create mode 100755 images/azure-ambari-prometheus-exporter/build.sh
 create mode 100644 images/azure-ambari-prometheus-exporter/collector.py
 create mode 100644 images/azure-ambari-prometheus-exporter/components.yaml
 create mode 100755 images/azure-ambari-prometheus-exporter/metadata.sh
 create mode 100644 images/azure-ambari-prometheus-exporter/requirements.txt
 create mode 100644 kubernetes/ansible/roles/sunbird-monitoring/templates/azure-ambari-prometheus-exporter.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/.helmignore
 create mode 100644 kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/Chart.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/_helpers.tpl
 create mode 100644 kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/alerRules.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/deployment.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/service.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/serviceMonitor.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/values.yaml

diff --git a/images/azure-ambari-prometheus-exporter/Dockerfile b/images/azure-ambari-prometheus-exporter/Dockerfile
new file mode 100644
index 000000000..17a504516
--- /dev/null
+++ b/images/azure-ambari-prometheus-exporter/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3.9.0-alpine
+MAINTAINER Revathi Kotla <revathi21kotla@gmail.com>
+RUN mkdir /src
+WORKDIR /src
+COPY requirements.txt /src/requirements.txt
+RUN pip install -r requirements.txt
+COPY collector.py /src/collector.py
+COPY components.yaml /src/components.yaml
+EXPOSE 9999
+CMD ["python", "collector.py"]
diff --git a/images/azure-ambari-prometheus-exporter/Jenkinsfile b/images/azure-ambari-prometheus-exporter/Jenkinsfile
new file mode 100644
index 000000000..6c9df559b
--- /dev/null
+++ b/images/azure-ambari-prometheus-exporter/Jenkinsfile
@@ -0,0 +1,50 @@
+node('build-slave') {
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        ansiColor('xterm') {
+            stage('Checkout') {
+                if (!env.hub_org) {
+                    println(ANSI_BOLD + ANSI_RED + "Uh Oh! Please set a Jenkins environment variable named hub_org with value as registery/sunbidrded" + ANSI_NORMAL)
+                    error 'Please resolve the errors and rerun..'
+                } else
+                    println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
+            }
+            sh'[[ -d .git ]] && git clean -ffxd'
+            checkout scm
+            if (params.github_release_tag == "") {
+                checkout scm
+                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+                branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim()
+                build_tag = branch_name + "_" + commit_hash + "_" + env.BUILD_NUMBER
+                println(ANSI_BOLD + ANSI_YELLOW + "Tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL)
+            } else {
+                def scmVars = checkout scm
+                checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/$params.github_release_tag"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+                build_tag = params.github_release_tag + "_" +  env.BUILD_NUMBER
+                println(ANSI_BOLD + ANSI_YELLOW + "Tag specified, building from tag: " + params.github_release_tag + ANSI_NORMAL)
+            }
+            echo "build_tag: " + build_tag
+
+            stage('Build') {
+                env.NODE_ENV = "build"
+                print "Environment will be : ${env.NODE_ENV}"
+                sh("cd ./images/azure-ambari-prometheus-exporter && ./build.sh ${build_tag} ${env.NODE_NAME} ${hub_org}")
+            }
+            stage('ArchiveArtifacts') {
+                archiveArtifacts "images/azure-ambari-prometheus-exporter/metadata.json"
+                currentBuild.description = "${build_tag}"
+            }
+        }
+
+    }
+    catch (err) {
+        currentBuild.result = "FAILURE"
+        throw err
+    }
+
+}
diff --git a/images/azure-ambari-prometheus-exporter/build.sh b/images/azure-ambari-prometheus-exporter/build.sh
new file mode 100755
index 000000000..104557544
--- /dev/null
+++ b/images/azure-ambari-prometheus-exporter/build.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+build_tag=$1
+node=$2
+org=$3
+
+docker build -f Dockerfile -t ${org}/azure-ambari-prometheus-exporter:${build_tag} .
+echo {\"image_name\" : azure-ambari-prometheus-exporter, \"image_tag\" : \"${build_tag}\", \"node_name\" : \"$node\"} > metadata.json
diff --git a/images/azure-ambari-prometheus-exporter/collector.py b/images/azure-ambari-prometheus-exporter/collector.py
new file mode 100644
index 000000000..3abf3396c
--- /dev/null
+++ b/images/azure-ambari-prometheus-exporter/collector.py
@@ -0,0 +1,294 @@
+import os
+import json
+import yaml
+import re
+import time
+import logging
+import datetime
+from pytz import timezone
+from datetime import timedelta,date
+from prometheus_client import start_http_server
+from prometheus_client.core import GaugeMetricFamily, REGISTRY
+from expiringdict import ExpiringDict
+import requests
+
+LOGLEVEL = os.getenv('LOGLEVEL', 'INFO').upper()
+logging.basicConfig(
+    format='%(asctime)s - %(levelname)s - %(message)s'
+    , datefmt='%m/%d/%Y %I:%M:%S %p'
+    , level=LOGLEVEL
+)
+
+BATCH_DELAY = os.getenv('BATCH_DELAY', 60)
+CONF_FILE = os.getenv('CONF_FILE', 'conf/components.yaml')
+
+
+
+class AmbariMetricCollector(object):
+    def __init__(self, conf_file):
+        self.cache = ExpiringDict(max_len=10000, max_age_seconds=86400)
+        self.prom_metrics = {}
+        self.host = {}	
+        self.ambari_info = {
+            'AMBARI_USER': os.getenv('AMBARI_USER')
+            , 'AMBARI_PASS': os.getenv('AMBARI_PASS')
+        }
+
+        with open(conf_file, "r") as read_conf_file:
+            conf = yaml.load(read_conf_file)
+
+        self.conf_nn, self.conf_rm, self.conf_alert, self.conf_apphistory = self._parse_conf(conf)
+
+    def _parse_conf(self, conf):
+        conf_nn = conf.get('namenode', None)
+        conf_rm = conf.get('resourcemanager', None)
+        conf_alert = conf.get('ambari_alert', None)
+        conf_apphistory= conf.get('ambari_apphistory', None)
+
+        return conf_nn, conf_rm, conf_alert, conf_apphistory
+
+    def _parse_metrics(self, data, prefix, metrics): 		
+        for k, v in data.items():
+            if type(v) is dict:
+                prefix.append(k)
+                self._parse_metrics(v, prefix, metrics)
+                if len(prefix) > 0:
+                    prefix.pop(len(prefix) - 1)
+            else:	
+                metric_name = '{}_{}'.format('_'.join(prefix), k)
+
+                if type(v) is int or type(v) is float:
+                    metrics[metric_name] = v
+
+    def _parse_cluster_metrics(self, data, prefix, metrics, host): 
+        for k, v in data.items():
+            if k in ('HostRoles'):
+                  host['component_name'] = str(v['component_name'])
+                  host['host_name']= v['host_name'].replace(".", "_").replace("-", "_")
+            elif type(v) is dict:
+                prefix.append(k)
+                self._parse_cluster_metrics(v, prefix, metrics, host)
+                if len(prefix) > 0:
+                    prefix.pop(len(prefix) - 1)
+            else:
+                metric_name = '{}_{}'.format('_'.join(prefix), k)
+                if type(v) is int or type(v) is float:
+                    if bool(host) :
+                       prom_metric = GaugeMetricFamily(metric_name, metric_name, labels=['component_name','host_name'])
+                       prom_metric.add_metric([host['component_name'],host['host_name']],v)
+                       metric_name +=(host['host_name'])
+                       metrics[metric_name] = prom_metric
+
+    def _parse_with_filter(self, data, prefix, metrics, conf):
+        new_metrics = {}
+        self._parse_metrics(data, prefix, new_metrics)
+
+        if conf.get('white_list', None):
+            self._filter_metric_in_white_list(new_metrics, conf.get('white_list', None))
+        elif conf.get('black_list', None):
+            self._filter_metric_in_black_list(new_metrics, conf.get('black_list', None))
+
+        metrics.update(new_metrics)
+
+    def _parse_with_clusterfilter(self, data, prefix, metrics, conf):
+        new_metrics = {}
+        host = {}
+        self._parse_cluster_metrics(data, prefix, new_metrics, host)
+
+        if conf.get('white_list', None):
+            self._filter_metric_in_white_list(new_metrics, conf.get('white_list', None))
+        elif conf.get('black_list', None):
+            self._filter_metric_in_black_list(new_metrics, conf.get('black_list', None))
+
+        self.prom_metrics.update(new_metrics)
+        metrics.update(new_metrics)
+
+    def _parse_apphistory_metrics(self, data, prefix, app_id, metrics,group_metric):
+        for k, v in data.items():
+            if type(v) is dict:
+                prefix.append(k)
+                self._parse_metrics(v, prefix, metrics)
+                if len(prefix) > 0:
+                    prefix.pop(len(prefix) - 1)
+            else:
+                if len(prefix) > 0:
+                    metric_name = '{}_{}'.format('_'.join(prefix), k)
+                else:
+                    metric_name = k
+
+                if type(v) is int or type(v) is float:
+                    prom_metric = GaugeMetricFamily(metric_name, metric_name, labels=list(group_metric.keys()))
+                    prom_metric.add_metric(list(group_metric.values()),v)
+                    metric_name += app_id
+                    metric_name += str(group_metric['stageId'])
+                    metrics[metric_name] = prom_metric
+
+    def _parse_apphistory_with_filter(self, data, prefix, app_id, group_metric, metrics, conf):
+        new_metrics = {}
+        host = {}
+        self._parse_apphistory_metrics(data, prefix, app_id, new_metrics, group_metric)
+
+        if conf.get('white_list', None):
+            self._filter_metric_in_white_list(new_metrics, conf.get('white_list', None))
+        elif conf.get('black_list', None):
+            self._filter_metric_in_black_list(new_metrics, conf.get('black_list', None))
+        for k,v in new_metrics.items():
+            if(len(self.cache) == 0 or k not in self.cache.keys()):
+              self.cache[k] = v
+              self.prom_metrics[k] = v
+              metrics[k] = v
+            else:
+              #self.prom_metrics.pop(k,'No Key found')
+              metrics.pop(k,'No Key found')
+    
+    def _filter_by_rule(self, metrics, rules, is_wl=True):
+        if rules is None:
+            return
+
+        remove_metrics = []
+        for k, v in metrics.items():
+            if is_wl:
+                remove = True
+                for bl in rules:
+                    if re.search(bl, k):
+                        remove = False
+                        break
+
+                if remove:
+                    remove_metrics.append(k)
+            else:
+                for bl in rules:
+                    if re.search(bl, k):
+                        remove_metrics.append(k)
+                        break
+
+        for rm in remove_metrics:
+            if rm in metrics:
+                del metrics[rm]
+
+    def _filter_metric_in_black_list(self, metrics, metrics_bl=None):
+        self._filter_by_rule(metrics, metrics_bl, is_wl=False)
+
+    def _filter_metric_in_white_list(self, metrics, metrics_wl=None):
+        self._filter_by_rule(metrics, metrics_wl, is_wl=True)
+
+    def _collect_ambari_alerts(self, metrics):
+        try:
+            ambari_alert_url = os.getenv('AMBARI_ALERT_URL', '')	
+            data = self._call_ambari_api(ambari_alert_url)
+        except Exception as e:
+            logging.error('Call Ambari API error.\n {}'.format(e))
+
+            return
+
+        self._parse_with_filter(data['alerts_summary'], ['ambari_alert'], metrics, self.conf_alert)
+
+    def _collect_namenode_metrics(self, metrics):
+        try:
+            ambari_metrics_url = os.getenv('AMBARI_METRICS_URL', '')
+            data = self._call_json_api(ambari_metrics_url)
+        except Exception as e:
+            logging.error('Call Namenode JMX error.\n {}'.format(e))
+
+            return
+
+        for item in data['items']:
+          self._parse_with_clusterfilter(item, ['cluster'], metrics, self.conf_nn)
+
+    def _collect_resourcemanager_metrics(self, metrics):
+        try:
+            data = self._call_json_api(os.getenv('AMBARI_RM_URL', ''), headers={'Accept': 'application/json'})
+        except Exception as e:
+            logging.error('Call Resource Manager metrics error.\n {}'.format(e))
+            return
+
+        if not data.get('clusterMetrics'):
+            return
+
+        self._parse_with_filter(data['clusterMetrics'], ['resourcemanager'], metrics, self.conf_rm)
+
+    def _collect_apphistory_metrics(self, metrics):
+            group_metric={}
+            date_today = (int(date.today().strftime('%s')) * 1000)
+            try:
+                url = self.conf_apphistory['url']+'?minDate='+(datetime.datetime.now(timezone('GMT'))-datetime.timedelta(minutes = 10)).strftime('%Y-%m-%dT%H:%M:%S.000GMT')+'&maxDate='+(datetime.datetime.now(timezone('GMT'))+datetime.timedelta(minutes = 10)).strftime('%Y-%m-%dT%H:%M:%S.000GMT')
+                data = self._call_json_api(url)
+            except Exception as e:
+                logging.error('Call Namenode JMX error.\n {}'.format(e))
+                return
+            for item in data:
+               latest_attempt =  len(item['attempts'])
+               if item['attempts'][latest_attempt-1]['endTimeEpoch'] >= date_today:
+                 app_data= self._call_json_api(os.getenv('AMBARI_APPHISTORY_URL', '')+r"/"+item['id']+r"/"+str(latest_attempt)+r"/"+"stages")
+                 group_metric['appname'] = item['name'].replace(" ", "")
+                 for data_item in app_data :
+                   data_item['reportDate'] = item['attempts'][latest_attempt-1]['lastUpdated']
+                   data_item['timeTaken']= item['attempts'][latest_attempt-1]['duration']
+                   for label in self.conf_apphistory['labels']:
+                     group_metric[label]= str(data_item[label])
+                   self._parse_apphistory_with_filter(data_item,[] ,item['id'], group_metric , metrics, self.conf_apphistory) 
+
+    def _collect(self):
+        metrics = {}
+        labels = {}
+        host = {}
+        self._collect_resourcemanager_metrics(metrics)
+        self._collect_ambari_alerts(metrics)
+        self._collect_namenode_metrics(metrics)
+        self._collect_apphistory_metrics(metrics)
+
+        for k, v in metrics.items():
+             prom_metric = self.prom_metrics.get(k, None)
+             if not prom_metric:
+                prom_metric = GaugeMetricFamily(k, k, labels=['cluster_name', 'component_name', 'host_name'])
+                self.prom_metrics[k] = prom_metric
+                prom_metric.add_metric(list(labels.values()), v)
+
+    def collect(self):
+        logging.info('Start fetching metrics')
+        self._collect()
+        logging.info('Finish fetching metrics')
+        for m in list(self.prom_metrics.values()):
+           yield m
+
+    def _call_ambari_api(self, url):
+        """
+        Call Ambari's API to return json data
+        Sample curl
+        curl -k \
+        -u username:password \
+        -H 'X-Requested-By: ambari' \
+        -X GET \
+        "https://localhost:8080/api/v1/clusters/trustingsocial/host_components?fields=metrics/*"
+        """
+
+        ambari_info = self.ambari_info
+
+        response = requests.get(
+            url
+            , auth=(ambari_info['AMBARI_USER'], ambari_info['AMBARI_PASS'])
+            , headers={'X-Requested-By': 'ambari'}
+            , verify=False
+        )
+
+        if response.status_code != requests.codes.ok:
+            return {}
+        return response.json()
+
+    def _call_json_api(self, url, headers={}):
+        ambari_info = self.ambari_info
+        response = requests.get(url, auth=(ambari_info['AMBARI_USER'], ambari_info['AMBARI_PASS']), headers=headers)
+        	
+        if response.status_code != requests.codes.ok:
+            return {}
+        return response.json()
+
+
+if __name__ == "__main__":
+    collector = AmbariMetricCollector(CONF_FILE)
+
+    REGISTRY.register(collector)
+    start_http_server(9999)
+    while True:
+        time.sleep(1)
+
diff --git a/images/azure-ambari-prometheus-exporter/components.yaml b/images/azure-ambari-prometheus-exporter/components.yaml
new file mode 100644
index 000000000..557505fa4
--- /dev/null
+++ b/images/azure-ambari-prometheus-exporter/components.yaml
@@ -0,0 +1,27 @@
+namenode:
+    white_list:
+        - 'cpu'
+        - 'memory'
+        - 'cluster_name'
+
+resourcemanager:
+    white_list:
+        - '.*'
+
+ambari_alert:
+    white_list:
+        - '.*\.count'
+
+ambari_apphistory:
+    labels:
+        - 'status'
+        - 'name'
+        - 'attemptId'
+        - 'stageId'
+        - 'reportDate'
+    white_list:
+        - 'numCompleteTasks'
+        - 'numFailedTasks'
+        - 'numTasks'
+        - 'shuffleWriteBytes'
+        - 'timeTaken'
diff --git a/images/azure-ambari-prometheus-exporter/metadata.sh b/images/azure-ambari-prometheus-exporter/metadata.sh
new file mode 100755
index 000000000..204c65f8f
--- /dev/null
+++ b/images/azure-ambari-prometheus-exporter/metadata.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# return version
+echo '{"name":"azure-ambari-prometheus-exporter","version":"1.0","org":"sunbird","hubuser":"purplesunbird"}'
diff --git a/images/azure-ambari-prometheus-exporter/requirements.txt b/images/azure-ambari-prometheus-exporter/requirements.txt
new file mode 100644
index 000000000..acbda796d
--- /dev/null
+++ b/images/azure-ambari-prometheus-exporter/requirements.txt
@@ -0,0 +1,4 @@
+PyYAML
+prometheus_client
+requests
+expiring-dict
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/azure-ambari-prometheus-exporter.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/azure-ambari-prometheus-exporter.yaml
new file mode 100644
index 000000000..a6ee4ed5b
--- /dev/null
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/azure-ambari-prometheus-exporter.yaml
@@ -0,0 +1,19 @@
+env:
+  ambari:
+    # rm_url - get ambari metrics for resource manager in azure cluster(appsubmitted, appfailed etc)
+    rm_url: "http://{{env}}-spark-cluster.azurehdinsight.net/ws/v1/cluster/metrics"
+    # metrics_url - get metrics for all metrics for hdinsight cluster for each component
+    metrics_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/clusters/{{env}}-spark-cluster/host_components?fields=metrics/*"
+    # alert_url - get alert count for the cluster (critical,ok etc)
+    alert_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/clusters/{{env}}-spark-cluster/alerts?format=summary
+    # cluster_app_history_url - get the history of applications that run so far in cluster
+    app_history_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/applications
+    # user name for azure hdcluster
+    user: admin
+    # password for azure hdcluster
+    pass: "{{ azure_spark_cluster_http_password }}"
+
+
+#Hd cluster alert values
+app_failed_critical: 1
+nodes_inactive_critical: 1
diff --git a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/.helmignore b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/Chart.yaml b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/Chart.yaml
new file mode 100644
index 000000000..d64ba6ad0
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/Chart.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+name: azure-ambari-prometheus-exporter
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application.
+appVersion: 1.16.0
diff --git a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/_helpers.tpl b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/_helpers.tpl
new file mode 100644
index 000000000..08a3782a4
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/_helpers.tpl
@@ -0,0 +1,63 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "azure-ambari-prometheus-exporter.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "azure-ambari-prometheus-exporter.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "azure-ambari-prometheus-exporter.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "azure-ambari-prometheus-exporter.labels" -}}
+helm.sh/chart: {{ include "azure-ambari-prometheus-exporter.chart" . }}
+{{ include "azure-ambari-prometheus-exporter.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "azure-ambari-prometheus-exporter.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "azure-ambari-prometheus-exporter.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "azure-ambari-prometheus-exporter.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "azure-ambari-prometheus-exporter.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/alerRules.yaml b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/alerRules.yaml
new file mode 100644
index 000000000..afd846b99
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/alerRules.yaml
@@ -0,0 +1,30 @@
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    {{- include "azure-ambari-prometheus-exporter.labels" . | nindent 4 }}
+    {{- toYaml .Values.serviceMonitor.labels | nindent 4 }}
+  name: {{ include "azure-ambari-prometheus-exporter.fullname" . }}-alertrule
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+spec:
+  groups:
+  - name: HDClusterMetrics
+    rules:
+    - alert: No of Jobs Failed 
+      expr: sum(resourcemanager_appsFailed) > {{ .Values.app_failed_critical }}
+      for: 1m
+      labels:
+        severity: critical
+      annotations:
+        message: {{`"No of jobs failed is {{$value}}"`}}
+        summary: Jobs Failed
+
+    - alert: No of Cluster Nodes InActive
+      expr: sum(resourcemanager_lostNodes) > {{ .Values.nodes_inactive_critical }}
+      for: 5m
+      labels:
+        severity: fatal
+      annotations:
+        message: {{`"Cluster Nodes InActive count is {{$value}}"`}}
+        summary: Node inactive in hdcluster
diff --git a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/deployment.yaml b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/deployment.yaml
new file mode 100644
index 000000000..b1a9d7927
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/deployment.yaml
@@ -0,0 +1,46 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "azure-ambari-prometheus-exporter.fullname" . }}
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+  labels:
+    {{- include "azure-ambari-prometheus-exporter.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "azure-ambari-prometheus-exporter.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "azure-ambari-prometheus-exporter.selectorLabels" . | nindent 8 }}
+    spec:
+    {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+          - name: AMBARI_RM_URL
+            value: "{{ .Values.env.ambari.rm_url }}"
+          - name: AMBARI_METRICS_URL
+            value: "{{ .Values.env.ambari.metrics_url }}"
+          - name: AMBARI_ALERT_URL
+            value: "{{ .Values.env.ambari.alert_url }}"
+          - name: AMBARI_APPHISTORY_URL
+          - value: "{{ .Values.env.ambari.app_history_url }}"
+          - name: AMBARI_USER
+            value: "{{ .Values.env.ambari.user }}"
+          - name: AMBARI_PASS
+            value: "{{ .Values.env.ambari.pass }}"
+          - name: PYTHONWARNINGS
+            value: "ignore:Unverified HTTPS request"
+          ports:
+            - name: http
+              containerPort: 9999
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/service.yaml b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/service.yaml
new file mode 100644
index 000000000..0fbc7f780
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "azure-ambari-prometheus-exporter.fullname" . }}
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+  labels:
+    {{- include "azure-ambari-prometheus-exporter.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: metrics
+  selector:
+    {{- include "azure-ambari-prometheus-exporter.selectorLabels" . | nindent 4 }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/serviceMonitor.yaml b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/serviceMonitor.yaml
new file mode 100644
index 000000000..2dbb68b7c
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/serviceMonitor.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    {{- include "azure-ambari-prometheus-exporter.labels" . | nindent 6 }}
+    {{ toYaml .Values.serviceMonitorLabels | nindent 6 }}
+  name: {{ include "azure-ambari-prometheus-exporter.fullname" . }}
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+spec:
+  endpoints:
+  - honorLabels: true
+    port: metrics
+    relabelings:
+    - action: labeldrop
+      regex: ^pod$
+  namespaceSelector:
+    matchNames:
+    - monitoring
+  selector:
+    matchLabels:
+    {{- include "azure-ambari-prometheus-exporter.labels" . | nindent 6 }}
+
diff --git a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/values.yaml b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/values.yaml
new file mode 100644
index 000000000..5fde214fb
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/values.yaml
@@ -0,0 +1,41 @@
+# Default values for kafka-topic-exporter.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: sunbird/azure-ambari-prometheus-exporter:v1
+  pullPolicy: IfNotPresent
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+service:
+  type: ClusterIP
+  port: 9999
+
+# This value should be overridden by user
+# env:
+#   kafka:
+#     host: 10.0.0.92:9092
+#     topic: sunbird.metrics.topic
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+serviceMonitorLabels:
+  release: prometheus-operator
+
+###samza_topic_lag warning/critical threshold
+app_failed_critical: 1
+nodes_inactive_critical: 1

From 8515dddb4c47d8bbd09c1e616c06d0455a772d97 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Tue, 15 Dec 2020 12:44:10 +0000
Subject: [PATCH 072/184] fix: discussionsmw service name (#2091)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../helm_charts/core/discussionsmw/templates/deployment.yaml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/core/discussionsmw/templates/deployment.yaml b/kubernetes/helm_charts/core/discussionsmw/templates/deployment.yaml
index 7cfc8ef45..6a5219068 100644
--- a/kubernetes/helm_charts/core/discussionsmw/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/discussionsmw/templates/deployment.yaml
@@ -46,7 +46,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: disussionsmw-service
+  name: discussionsmw-service
   namespace: {{ .Values.namespace }}
   labels:
     app: {{ .Chart.Name }}

From 1b3319168e3845e33b2f7b256f9d079c67bdbb89 Mon Sep 17 00:00:00 2001
From: Sowmya N Dixit <sowmyadixit7@gmail.com>
Date: Wed, 16 Dec 2020 15:40:09 +0530
Subject: [PATCH 073/184] Issue #TG-694 feat: Analytics API - redis config
 changes (#2044)

---
 ansible/roles/stack-sunbird/defaults/main.yml                   | 1 +
 .../roles/stack-sunbird/templates/analytics_api_service.conf    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml
index cd27fce92..d2cde9d90 100644
--- a/ansible/roles/stack-sunbird/defaults/main.yml
+++ b/ansible/roles/stack-sunbird/defaults/main.yml
@@ -764,6 +764,7 @@ default_channel_id: "in.ekstep"
 default_channel: "{{default_org_hash_id}}"
 channel_data_exhaust_bucket: dev-data-store
 metadata_redis_host: "{{ groups['dp-redis'][0] }}"
+metadata_redis_port: 6379
 lp_composite_search_host: "{{ groups['composite-search-cluster'][0] }}"
 ingestion_kafka_brokers: "{{groups['ingestion-cluster-kafka']|join(':9092,')}}:9092"
 geo_location_city: "{{ env_name }}_geo_location_city"
diff --git a/ansible/roles/stack-sunbird/templates/analytics_api_service.conf b/ansible/roles/stack-sunbird/templates/analytics_api_service.conf
index 5007c9b62..9a4aeb26c 100644
--- a/ansible/roles/stack-sunbird/templates/analytics_api_service.conf
+++ b/ansible/roles/stack-sunbird/templates/analytics_api_service.conf
@@ -196,7 +196,7 @@ metrics.time.interval.min=30
 cache.refresh.time.interval.min=1440
 redis.host="{{metadata_redis_host}}"
 #redis.host="localhost"
-redis.port=6379
+redis.port={{ metadata_redis_port }}
 #redis.port=__redis_port__
 redis.connection.max=20
 redis.connection.idle.max=20

From c00dcb369290aed3b9b5718333149c0bc5b2b471 Mon Sep 17 00:00:00 2001
From: VenkatKadiveti <60449077+VenkatKadiveti@users.noreply.github.com>
Date: Wed, 16 Dec 2020 16:11:51 +0530
Subject: [PATCH 074/184] Issue sh-21326 fix: discussion forum envs (#2092)

* Issue sh-21326 fix: discussion forum envs
---
 .../stack-sunbird/templates/sunbird_discussions-mw-service.env   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
index e69de29bb..9deda226a 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
@@ -0,0 +1 @@
+discussion_forum_token= {{ discussion_forum_token }}
\ No newline at end of file

From c7e9679c8767bf1df17b7e6b955f6883f2c98640 Mon Sep 17 00:00:00 2001
From: kaliraja <34502260+Kaali09@users.noreply.github.com>
Date: Wed, 16 Dec 2020 17:42:53 +0530
Subject: [PATCH 075/184] Jenkins file fix  (#2094)

* Issue: #0000: Added the missed quotes

* Issue: #0000: updated the jenkinsfile
---
 images/azure-ambari-prometheus-exporter/Jenkinsfile | 1 -
 images/azure-ambari-prometheus-exporter/build.sh    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/images/azure-ambari-prometheus-exporter/Jenkinsfile b/images/azure-ambari-prometheus-exporter/Jenkinsfile
index 6c9df559b..f25310a25 100644
--- a/images/azure-ambari-prometheus-exporter/Jenkinsfile
+++ b/images/azure-ambari-prometheus-exporter/Jenkinsfile
@@ -14,7 +14,6 @@ node('build-slave') {
                 } else
                     println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
             }
-            sh'[[ -d .git ]] && git clean -ffxd'
             checkout scm
             if (params.github_release_tag == "") {
                 checkout scm
diff --git a/images/azure-ambari-prometheus-exporter/build.sh b/images/azure-ambari-prometheus-exporter/build.sh
index 104557544..4e98719cd 100755
--- a/images/azure-ambari-prometheus-exporter/build.sh
+++ b/images/azure-ambari-prometheus-exporter/build.sh
@@ -5,4 +5,4 @@ node=$2
 org=$3
 
 docker build -f Dockerfile -t ${org}/azure-ambari-prometheus-exporter:${build_tag} .
-echo {\"image_name\" : azure-ambari-prometheus-exporter, \"image_tag\" : \"${build_tag}\", \"node_name\" : \"$node\"} > metadata.json
+echo {\"image_name\" : \"azure-ambari-prometheus-exporter\", \"image_tag\" : \"${build_tag}\", \"node_name\" : \"$node\"} > metadata.json

From 7e68d750eeac6004890c677c45a50289a7364b63 Mon Sep 17 00:00:00 2001
From: Sowmya N Dixit <sowmyadixit7@gmail.com>
Date: Wed, 16 Dec 2020 19:32:35 +0530
Subject: [PATCH 076/184] Issue #TG-748 feat: Analytics API - redis config
 changes (#2095)

---
 ansible/roles/stack-sunbird/defaults/main.yml                   | 2 +-
 .../roles/stack-sunbird/templates/analytics_api_service.conf    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml
index d2cde9d90..b2e7fde13 100644
--- a/ansible/roles/stack-sunbird/defaults/main.yml
+++ b/ansible/roles/stack-sunbird/defaults/main.yml
@@ -764,7 +764,7 @@ default_channel_id: "in.ekstep"
 default_channel: "{{default_org_hash_id}}"
 channel_data_exhaust_bucket: dev-data-store
 metadata_redis_host: "{{ groups['dp-redis'][0] }}"
-metadata_redis_port: 6379
+device_db_redis_port: 6379
 lp_composite_search_host: "{{ groups['composite-search-cluster'][0] }}"
 ingestion_kafka_brokers: "{{groups['ingestion-cluster-kafka']|join(':9092,')}}:9092"
 geo_location_city: "{{ env_name }}_geo_location_city"
diff --git a/ansible/roles/stack-sunbird/templates/analytics_api_service.conf b/ansible/roles/stack-sunbird/templates/analytics_api_service.conf
index 9a4aeb26c..9e7198171 100644
--- a/ansible/roles/stack-sunbird/templates/analytics_api_service.conf
+++ b/ansible/roles/stack-sunbird/templates/analytics_api_service.conf
@@ -196,7 +196,7 @@ metrics.time.interval.min=30
 cache.refresh.time.interval.min=1440
 redis.host="{{metadata_redis_host}}"
 #redis.host="localhost"
-redis.port={{ metadata_redis_port }}
+redis.port={{ device_db_redis_port }}
 #redis.port=__redis_port__
 redis.connection.max=20
 redis.connection.idle.max=20

From 2c0b6b319fa5d160e2cd656c81894313238b36bf Mon Sep 17 00:00:00 2001
From: G33tha <geethap240@gmail.com>
Date: Thu, 17 Dec 2020 10:45:54 +0530
Subject: [PATCH 077/184] Release 3.4.0 variables update (#2085)

* updated analytics and search service url

* Update all.yml

* Update common.yml

* Update secrets.yml

* Update hosts

* Update common.yml

* Update secrets.yml

* Update common.yml

* Update hosts

* Update common.yml

* Update secrets.yml

* Update hosts

* Update common.yml

* Update jenkins-server-setup.sh

* added jenkins jobs

* Update jenkins-plugins-setup.sh

Co-authored-by: G33tha <geethap240@gmial.com>
---
 ansible/inventory/env/group_vars/all.yml      |  22 +-
 deploy/jenkins/jenkins-plugins-setup.sh       |  12 +-
 deploy/jenkins/jenkins-server-setup.sh        |  18 +-
 .../jobs/dev/jobs/Core/config.xml             |   8 +-
 .../dev/jobs/Core/jobs/APIManager/config.xml  |  32 +--
 .../jobs/Core/jobs/APIManagerEcho/config.xml  |  34 +--
 .../dev/jobs/Core/jobs/AdminUtils/config.xml  |  81 +++---
 .../dev/jobs/Core/jobs/Analytics/config.xml   | 108 ++++++++
 .../dev/jobs/Core/jobs/Assessment/config.xml  |  24 +-
 .../jobs/dev/jobs/Core/jobs/Badger/config.xml |  30 +--
 .../jobs/dev/jobs/Core/jobs/Bot/config.xml    | 108 ++++++++
 .../dev/jobs/Core/jobs/Cassandra/config.xml   |  22 +-
 .../Core/jobs/CassandraDecrypt/config.xml     |  22 +-
 .../jobs/CassandraStateValidated/config.xml   | 108 ++++++++
 .../Core/jobs/CassandraTrigger/config.xml     |  26 +-
 .../jobs/dev/jobs/Core/jobs/Cert/config.xml   |  26 +-
 .../Core/jobs/CertRegistryService/config.xml  |  24 +-
 .../jobs/dev/jobs/Core/jobs/Config/config.xml | 108 ++++++++
 .../dev/jobs/Core/jobs/Content/config.xml     |  26 +-
 .../dev/jobs/Core/jobs/EncService/config.xml  |  26 +-
 .../jobs/dev/jobs/Core/jobs/Groups/config.xml | 108 ++++++++
 .../Core/jobs/Hawkeye-superset/config.xml     | 108 ++++++++
 .../dev/jobs/Core/jobs/Keycloak/config.xml    |  28 +-
 .../dev/jobs/Core/jobs/KnowledgeMW/config.xml |  24 +-
 .../dev/jobs/Core/jobs/Learner/config.xml     |  24 +-
 .../jobs/dev/jobs/Core/jobs/Lms/config.xml    |  24 +-
 .../jobs/dev/jobs/Core/jobs/Nodebb/config.xml | 108 ++++++++
 .../jobs/Core/jobs/Notification/config.xml    |  24 +-
 .../jobs/dev/jobs/Core/jobs/Player/config.xml |  26 +-
 .../jobs/dev/jobs/Core/jobs/Print/config.xml  |  24 +-
 .../jobs/dev/jobs/Core/jobs/Proxy/config.xml  |  30 +--
 .../jobs/dev/jobs/Core/jobs/Report/config.xml | 108 ++++++++
 .../jobs/dev/jobs/Core/jobs/Router/config.xml | 108 ++++++++
 .../jobs/dev/jobs/Core/jobs/Search/config.xml | 108 ++++++++
 .../dev/jobs/Core/jobs/Taxonomy/config.xml    | 108 ++++++++
 .../dev/jobs/Core/jobs/Telemetry/config.xml   |  30 +--
 .../dev/jobs/Core/jobs/UserOrg/config.xml     |  26 +-
 .../jobs/dev/jobs/Core/jobs/Yarn/config.xml   |  24 +-
 .../jobs/dev/jobs/DataPipeline/config.xml     |   8 +-
 .../DataPipeline/jobs/AdhocScripts/config.xml | 108 ++++++++
 .../DataPipeline/jobs/Analytics/config.xml    |  22 +-
 .../jobs/AnalyticsCore/config.xml             | 108 ++++++++
 .../jobs/AnalyticsService/config.xml          | 108 ++++++++
 .../DataPipeline/jobs/ApiModule/config.xml    |  28 +-
 .../jobs/CoreDataProducts/config.xml          | 108 ++++++++
 .../DataPipeline/jobs/DataPipeline/config.xml |  22 +-
 .../DataPipeline/jobs/DataReplay/config.xml   | 108 ++++++++
 .../jobs/DataPipeline/jobs/ETLJobs/config.xml |  22 +-
 .../jobs/EdDataProducts/config.xml            | 108 ++++++++
 .../jobs/FlinkPipelineJobs/config.xml         | 108 ++++++++
 .../DataPipeline/jobs/MLWorkbench/config.xml  | 108 ++++++++
 .../jobs/DataPipeline/jobs/Secor/config.xml   |  22 +-
 .../jobs/CassandraTrigger/config.xml          |  24 +-
 .../KnowledgePlatform/jobs/Dial/config.xml    | 108 ++++++++
 .../jobs/FlinkJobs/config.xml                 | 108 ++++++++
 .../jobs/KnowledgePlatform/config.xml         |  24 +-
 .../KnowledgePlatform/jobs/Neo4j/config.xml   |  28 +-
 .../jobs/SyncTool/config.xml                  |  22 +-
 .../KnowledgePlatform/jobs/Yarn/config.xml    |  24 +-
 .../Plugins/jobs/CollectionEditor/config.xml  |  25 +-
 .../Plugins/jobs/ContentEditor/config.xml     |  24 +-
 .../Plugins/jobs/ContentPlayer/config.xml     |  24 +-
 .../Plugins/jobs/ContentPlugins/config.xml    |  24 +-
 .../Plugins/jobs/GenericEditor/config.xml     |  26 +-
 deploy/jenkins/jobs/Build/config.xml          |   9 +-
 .../jenkins/jobs/Build/jobs/Core/config.xml   |   8 +-
 .../jobs/Core/jobs/APIManager/config.xml      |  47 ++--
 .../jobs/APIManagerEcho_Backup/config.xml     |  38 +++
 .../jobs/Core/jobs/AdminUtils/config.xml      |  61 +++--
 .../Build/jobs/Core/jobs/Analytics/config.xml |  79 ++++++
 .../jobs/Core/jobs/ApiManagerEcho/config.xml  |  73 ++++++
 .../jobs/Core/jobs/Assessment/config.xml      |  22 +-
 .../Build/jobs/Core/jobs/Badger/config.xml    |  38 ++-
 .../Build/jobs/Core/jobs/Cassandra/config.xml |  22 +-
 .../Core/jobs/CassandraDecrypt/config.xml     |  39 +--
 .../jobs/CassandraStateValidated/config.xml   |  80 ++++++
 .../Core/jobs/CassandraTrigger/config.xml     |   4 +-
 .../jobs/Build/jobs/Core/jobs/Cert/config.xml |  29 +--
 .../Core/jobs/CertRegistryService/config.xml  |  31 +--
 .../jobs/Core/jobs/CloudStorageSDK/config.xml |  84 ++++++
 .../Build/jobs/Core/jobs/Config/config.xml    |  85 ++++++
 .../Build/jobs/Core/jobs/Content/config.xml   |  29 +--
 .../jobs/Core/jobs/EncService/config.xml      |  31 +--
 .../Build/jobs/Core/jobs/Groups/config.xml    |  78 ++++++
 .../Core/jobs/Hawkeye-superset/config.xml     |  78 ++++++
 .../Build/jobs/Core/jobs/Keycloak/config.xml  |  20 +-
 .../jobs/Core/jobs/KnowledgeMW/config.xml     |  33 +--
 .../Build/jobs/Core/jobs/Learner/config.xml   |  29 +--
 .../jobs/Build/jobs/Core/jobs/Lms/config.xml  |  26 +-
 .../Build/jobs/Core/jobs/Nodebb/config.xml    |  79 ++++++
 .../jobs/Core/jobs/Notification/config.xml    |  31 +--
 .../PlatformCoursesFunctionalTest/config.xml  |  88 +++++++
 .../Build/jobs/Core/jobs/Player/config.xml    |  67 +++--
 .../Core/jobs/PlayerCustomStage/config.xml    |  60 +++++
 .../Build/jobs/Core/jobs/Print/config.xml     |  31 +--
 .../Build/jobs/Core/jobs/Proxy/config.xml     |  24 +-
 .../Build/jobs/Core/jobs/Report/config.xml    |  78 ++++++
 .../Build/jobs/Core/jobs/Search/config.xml    |  78 ++++++
 .../Build/jobs/Core/jobs/Taxonomy/config.xml  |  78 ++++++
 .../Build/jobs/Core/jobs/Telemetry/config.xml |  34 +--
 .../Build/jobs/Core/jobs/UserOrg/config.xml   |  32 +--
 .../jobs/Build/jobs/Core/jobs/Yarn/config.xml |  34 +--
 .../jobs/Build/jobs/DataPipeline/config.xml   |  10 +-
 .../DataPipeline/jobs/AdhocScripts/config.xml |  68 +++++
 .../DataPipeline/jobs/Analytics/config.xml    |  32 +--
 .../jobs/AnalyticsCore/config.xml             |  80 ++++++
 .../jobs/AnalyticsService/config.xml          |  67 +++++
 .../DataPipeline/jobs/ApiModule/config.xml    |  30 +--
 .../jobs/CoreDataProducts/config.xml          |  80 ++++++
 .../DataPipeline/jobs/DataPipeline/config.xml |  30 +--
 .../DataPipeline/jobs/DataReplay/config.xml   |  68 +++++
 .../jobs/DataPipeline/jobs/ETLJobs/config.xml |  20 +-
 .../jobs/EdDataProducts/config.xml            |  80 ++++++
 .../jobs/FlinkPipelineJobs/config.xml         |  78 ++++++
 .../jobs/DataPipeline/jobs/Secor/config.xml   |  33 +--
 .../jobs/Build/jobs/Experiments/config.xml    |  29 +++
 .../jobs/Experiments/jobs/dev/config.xml      |  29 +++
 .../jobs/dev/jobs/Experiments/config.xml      |  29 +++
 .../dev/jobs/Experiments/jobs/exp1/config.xml | 121 +++++++++
 .../dev/jobs/Experiments/jobs/exp2/config.xml | 121 +++++++++
 .../dev/jobs/Experiments/jobs/exp3/config.xml |  26 ++
 .../jobs/Experiments_Job_Generator/config.xml |  85 ++++++
 .../Build/jobs/FunctionalTests/config.xml     |  28 ++
 .../jobs/FunctionalTests/jobs/Core/config.xml |  28 ++
 .../jobs/Core/jobs/Content/config.xml         |  80 ++++++
 .../Build/jobs/KnowledgePlatform/config.xml   |  10 +-
 .../jobs/CassandraTrigger/config.xml          |  22 +-
 .../KnowledgePlatform/jobs/Dial/config.xml    |  78 ++++++
 .../jobs/FlinkJobs/config.xml                 |  80 ++++++
 .../jobs/KnowledgePlatform/config.xml         |  24 +-
 .../jobs/LPFuntionalTest/config.xml           | 109 ++++++++
 .../jobs/LP_Decoupling_Test/config.xml        |  77 ++++++
 .../KnowledgePlatform/jobs/Neo4j/config.xml   |  29 +--
 .../jobs/SyncTool/config.xml                  |  29 +--
 .../KnowledgePlatform/jobs/Yarn/config.xml    |  37 +--
 .../Plugins/jobs/CollectionEditor/config.xml  |  24 +-
 .../Plugins/jobs/ContentEditor/config.xml     |  22 +-
 .../Plugins/jobs/ContentPlayer/config.xml     |  24 +-
 .../Plugins/jobs/ContentPlugins/config.xml    |  22 +-
 .../Plugins/jobs/GenericEditor/config.xml     |  22 +-
 deploy/jenkins/jobs/Deploy/config.xml         |   9 +-
 .../jenkins/jobs/Deploy/jobs/dev/config.xml   |   8 +-
 .../dev/jobs/Core/jobs/APIManager/config.xml  |  63 ++---
 .../dev/jobs/Core/jobs/AdminUtils/config.xml  |   4 +-
 .../dev/jobs/Core/jobs/Assessment/config.xml  |  10 +-
 .../jobs/dev/jobs/Core/jobs/Badger/config.xml |   6 +-
 .../dev/jobs/Core/jobs/Bootstrap/config.xml   |   4 +-
 .../jobs/CF-QUML_Migration_Script/config.xml  |  94 +++++++
 .../jobs/CassandraStateValidated/config.xml   | 214 ++++++++++++++++
 .../Core/jobs/CassandraTrigger/config.xml     |   4 +-
 .../jobs/dev/jobs/Core/jobs/Cert/config.xml   |   4 +-
 .../Core/jobs/CertRegistryService/config.xml  |   4 +-
 .../jobs/dev/jobs/Core/jobs/Config/config.xml | 137 ++++++++++
 .../dev/jobs/Core/jobs/Content/config.xml     |  62 ++---
 .../dev/jobs/Core/jobs/EncService/config.xml  |   4 +-
 .../dev/jobs/Core/jobs/KafkaSetup/config.xml  |  60 ++---
 .../jobs/Core/jobs/KeycloakCustom/config.xml  | 115 +++++++++
 .../Core/jobs/KeycloakMigration/config.xml    | 173 +++++++++++++
 .../jobs/Core/jobs/KeycloakRealm/config.xml   |  60 ++---
 .../dev/jobs/Core/jobs/KnowledgeMW/config.xml |   6 +-
 .../dev/jobs/Core/jobs/Learner/config.xml     |  62 ++---
 .../jobs/dev/jobs/Core/jobs/Lms/config.xml    |  62 ++---
 .../dev/jobs/Core/jobs/Logging/config.xml     |   6 +-
 .../dev/jobs/Core/jobs/Logstash/config.xml    |   4 +-
 .../dev/jobs/Core/jobs/Monitoring/config.xml  |  58 ++---
 .../jobs/Core/jobs/Notification/config.xml    |   4 +-
 .../jobs/dev/jobs/Core/jobs/Oauth/config.xml  |   6 +-
 .../dev/jobs/Core/jobs/OnboardAPIs/config.xml |   8 +-
 .../Core/jobs/OnboardConsumers/config.xml     |   6 +-
 .../jobs/dev/jobs/Core/jobs/Player/config.xml |  62 ++---
 .../dev/jobs/Core/jobs/PlayerCDN/config.xml   |  27 +-
 .../jobs/dev/jobs/Core/jobs/Print/config.xml  |   6 +-
 .../jobs/dev/jobs/Core/jobs/Proxy/config.xml  |  62 ++---
 .../jobs/ReloadContainerServices/config.xml   |   4 +-
 .../dev/jobs/Core/jobs/Telemetry/config.xml   |   4 +-
 .../Core/jobs/TelemetryLogstash/config.xml    |   4 +-
 .../dev/jobs/Core/jobs/UserOrg/config.xml     |   4 +-
 .../dev/jobs/Core/jobs/YarnOld/config.xml     | 234 +++++++++++++++++
 .../Core/jobs/offlineInstaller/config.xml     | 138 ++++++++++
 .../Core/jobs/offlinewindowstest32/config.xml | 135 ++++++++++
 .../Core/jobs/offlinewindowstest64/config.xml | 135 ++++++++++
 .../jobs/Core/jobs/user-Keycloak/config.xml   | 214 ++++++++++++++++
 .../jobs/dev/jobs/DataPipeline/config.xml     |  57 ++++-
 .../DataPipeline/jobs/AdhocScripts/config.xml | 227 +++++++++++++++++
 .../DataPipeline/jobs/AnalyticsAPI/config.xml | 122 +++++----
 .../jobs/AnalyticsCore/config.xml             | 239 +++++++++++++++++
 .../jobs/AnalyticsFetchLogs/config.xml        |  56 ++--
 .../AnalyticsGeoLocationDBSetup/config.xml    |   4 +-
 .../config.xml                                |  58 ++---
 .../jobs/AnalyticsReplayJobs/config.xml       |  80 +++---
 .../jobs/AnalyticsService/config.xml          | 225 ++++++++++++++++
 .../jobs/AnalyticsStartJobManager/config.xml  |   8 +-
 .../jobs/AnalyticsSubmitJobs/config.xml       |   8 +-
 .../DataPipeline/jobs/ApiModule/config.xml    |   8 +-
 .../jobs/CassandraDbUpdate/config.xml         |  58 +++--
 .../jobs/CoreDataProducts/config.xml          | 238 +++++++++++++++++
 .../DataPipeline/jobs/DataProducts/config.xml | 106 ++++----
 .../jobs/DataReplayJob/config.xml             | 153 +++++++++++
 .../jobs/DataReplayScript/config.xml          | 227 +++++++++++++++++
 .../jobs/DataproductsConfigUpdate/config.xml  |  68 ++---
 .../jobs/DruidIngestion/config.xml            |  58 +++--
 .../jobs/DruidSummaryMonthlyRollup/config.xml |  74 ++++++
 .../jobs/Druid_Health_Check/config.xml        |  70 +++++
 .../Druid_ingestion_health_check/config.xml   |  70 +++++
 .../Druid_segment_health_check/config.xml     |  74 ++++++
 .../jobs/ETLDruidContentIndexer/config.xml    | 111 ++++----
 .../jobs/DataPipeline/jobs/ETLJobs/config.xml | 111 ++++----
 .../jobs/ETLUserCacheIndexer/config.xml       | 128 ++++++----
 .../jobs/EdDataProducts/config.xml            | 238 +++++++++++++++++
 .../jobs/FlinkPipelineJobs/config.xml         | 172 +++++++++++++
 .../GraphitePrometheusExporter/config.xml     | 127 +++++++++
 .../jobs/InfraMonitoring/config.xml           | 129 ++++++++++
 .../DataPipeline/jobs/InternalKong/config.xml | 180 +++++++++++++
 .../DataPipeline/jobs/KafkaIndexer/config.xml |  60 ++---
 .../DataPipeline/jobs/KafkaSetup/config.xml   |  58 ++---
 .../jobs/DataPipeline/jobs/Logging/config.xml | 145 +++++++++++
 .../DataPipeline/jobs/MLWorkbench/config.xml  |  97 +++++++
 .../DataPipeline/jobs/Monitoring/config.xml   | 108 ++++----
 .../config.xml                                | 139 ++++++++++
 .../PipelineFlinkSummaryDenormStop/config.xml | 139 ++++++++++
 .../DataPipeline/jobs/RunReportJob/config.xml | 130 ++++++++++
 .../jobs/SamzaTelemetrySchemas/config.xml     |  66 ++---
 .../DataPipeline/jobs/SecorFlink/config.xml   | 226 ++++++++++++++++
 .../jobs/SubmitReportJob/config.xml           | 154 +++++++++++
 .../jobs/DataPipeline/jobs/Yarn/config.xml    |  71 +++---
 .../dev/jobs/KnowledgePlatform/config.xml     |   8 +-
 .../jobs/AssetSizeMigration/config.xml        |   4 +-
 .../jobs/CassandraDbUpdate/config.xml         |  60 ++---
 .../jobs/CassandraTrigger/config.xml          |   4 +-
 .../jobs/ContentTool/config.xml               |   4 +-
 .../KnowledgePlatform/jobs/Dial/config.xml    | 226 ++++++++++++++++
 .../jobs/ESMapping/config.xml                 |   4 +-
 .../jobs/FileSyncTool/config.xml              |   4 +-
 .../jobs/FlinkJobs/config.xml                 | 167 ++++++++++++
 .../jobs/InsertQRCode/config.xml              | 140 ++++++++++
 .../jobs/KafkaSetup/config.xml                |  60 ++---
 .../jobs/Learning/config.xml                  | 108 ++++----
 .../jobs/Monitoring/config.xml                |   4 +-
 .../KnowledgePlatform/jobs/Neo4j/config.xml   | 109 ++++----
 .../jobs/Neo4jDefinitionUpdate/config.xml     |  58 ++---
 .../Neo4jElasticSearchSyncTool/config.xml     | 113 ++++----
 .../KnowledgePlatform/jobs/Search/config.xml  |   6 +-
 .../jobs/StartNeo4jCluster/config.xml         |  60 ++---
 .../jobs/StopNeo4jCluster/config.xml          |   4 +-
 .../jobs/SyncQRCode/config.xml                | 127 +++++++++
 .../jobs/ValidateLearning/config.xml          |   4 +-
 .../KnowledgePlatform/jobs/Yarn/config.xml    | 106 ++++----
 .../jobs/dev/jobs/Kubernetes/config.xml       |  34 +++
 .../Kubernetes/jobs/APIManager/config.xml     | 159 ++++++++++++
 .../Kubernetes/jobs/APIManagerEcho/config.xml | 159 ++++++++++++
 .../Kubernetes/jobs/AdminUtils/config.xml     | 159 ++++++++++++
 .../jobs/Kubernetes/jobs/Analytics/config.xml | 159 ++++++++++++
 .../jobs/ApplicationElasticSearch/config.xml  | 117 +++++++++
 .../Kubernetes/jobs/Assessment/config.xml     | 159 ++++++++++++
 .../jobs/Kubernetes/jobs/Badger/config.xml    | 156 ++++++++++++
 .../jobs/BootstrapCluster/config.xml          | 127 +++++++++
 .../jobs/BootstrapMinimal/config.xml          |  57 +++++
 .../jobs/Kubernetes/jobs/Cassandra/config.xml | 219 ++++++++++++++++
 .../jobs/CassandraDBUpdate/config.xml         | 129 ++++++++++
 .../jobs/CassandraDecrypt/config.xml          | 229 +++++++++++++++++
 .../dev/jobs/Kubernetes/jobs/Cert/config.xml  | 159 ++++++++++++
 .../Kubernetes/jobs/CertRegistry/config.xml   | 159 ++++++++++++
 .../jobs/Kubernetes/jobs/Content/config.xml   | 159 ++++++++++++
 .../dev/jobs/Kubernetes/jobs/Enc/config.xml   | 159 ++++++++++++
 .../jobs/FuntionalTestCases/config.xml        |  69 +++++
 .../jobs/Kubernetes/jobs/Groups/config.xml    | 159 ++++++++++++
 .../jobs/Hawkeye-superset/config.xml          | 159 ++++++++++++
 .../jobs/Kubernetes/jobs/Keycloak/config.xml  | 206 +++++++++++++++
 .../jobs/KeycloakMigration/config.xml         | 173 +++++++++++++
 .../Kubernetes/jobs/KnowledgeMW/config.xml    | 159 ++++++++++++
 .../jobs/KongJWTAdminUtil/config.xml          | 136 ++++++++++
 .../jobs/Kubernetes/jobs/Learner/config.xml   | 159 ++++++++++++
 .../dev/jobs/Kubernetes/jobs/Lms/config.xml   | 159 ++++++++++++
 .../jobs/Kubernetes/jobs/Logging/config.xml   | 149 +++++++++++
 .../Kubernetes/jobs/Monitoring/config.xml     | 133 ++++++++++
 .../Kubernetes/jobs/NetworkConfig/config.xml  | 133 ++++++++++
 .../jobs/Kubernetes/jobs/Nodebb/config.xml    | 159 ++++++++++++
 .../Kubernetes/jobs/Notification/config.xml   | 159 ++++++++++++
 .../Kubernetes/jobs/OnboardAPIs/config.xml    | 136 ++++++++++
 .../jobs/OnboardConsumers/config.xml          | 117 +++++++++
 .../jobs/Kubernetes/jobs/Player/config.xml    | 159 ++++++++++++
 .../dev/jobs/Kubernetes/jobs/Print/config.xml | 159 ++++++++++++
 .../jobs/Kubernetes/jobs/Report/config.xml    | 159 ++++++++++++
 .../jobs/Kubernetes/jobs/Search/config.xml    | 159 ++++++++++++
 .../jobs/Kubernetes/jobs/Taxonomy/config.xml  | 159 ++++++++++++
 .../jobs/Kubernetes/jobs/Telemetry/config.xml | 159 ++++++++++++
 .../Kubernetes/jobs/UploadSchema/config.xml   | 133 ++++++++++
 .../jobs/Kubernetes/jobs/UserOrg/config.xml   | 159 ++++++++++++
 .../dev/jobs/Kubernetes/jobs/Yarn/config.xml  | 241 ++++++++++++++++++
 .../Kubernetes/jobs/certTemplate/config.xml   | 136 ++++++++++
 .../jobs/nginx-private-ingress/config.xml     | 149 +++++++++++
 .../jobs/nginx-public-ingress/config.xml      | 149 +++++++++++
 .../Plugins/jobs/CollectionEditor/config.xml  | 109 ++++----
 .../Plugins/jobs/ContentEditor/config.xml     | 107 ++++----
 .../Plugins/jobs/ContentPlayer/config.xml     | 100 ++++----
 .../Plugins/jobs/ContentPlugins/config.xml    | 107 ++++----
 .../Plugins/jobs/GenericEditor/config.xml     | 102 ++++----
 .../org_sunbird_questionunit_quml/config.xml  | 200 +++++++++++++++
 .../Summary/jobs/DeployedVersions/config.xml  |   4 +-
 .../jenkins/jobs/OpsAdministration/config.xml |   8 +-
 .../ApplicationElasticsearchBackup/config.xml |   6 +-
 .../config.xml                                |  60 +++--
 .../dev/jobs/Core/jobs/Bootstrap/config.xml   |   4 +-
 .../jobs/Core/jobs/CassandraBackup/config.xml |  28 +-
 .../Core/jobs/ClearDockerImages/config.xml    |  16 +-
 .../jobs/Core/jobs/ClearWorkspace/config.xml  |  43 +++-
 .../dev/jobs/Core/jobs/CreateUser/config.xml  |  68 ++---
 .../dev/jobs/Core/jobs/ESMapping/config.xml   |  60 ++---
 .../jobs/Core/jobs/EsReindexing/config.xml    |  91 +++++++
 .../jobs/Core/jobs/GrafanaBackup/config.xml   |   6 +-
 .../jobs/dev/jobs/Core/jobs/Health/config.xml |  43 ++++
 .../jobs/Core/jobs/JenkinsBackup/config.xml   |   6 +-
 .../dev/jobs/Core/jobs/KeyRotation/config.xml |   4 +-
 .../jobs/Core/jobs/KongMigration/config.xml   |   4 +-
 .../jobs/LoggerElasticSearchBackup/config.xml |   6 +-
 .../LoggerElasticSearchRestore/config.xml     |   4 +-
 .../jobs/ManagedPostgresBackup/config.xml     |  68 ++---
 .../dev/jobs/Core/jobs/MonitDeploy/config.xml |   4 +-
 .../dev/jobs/Core/jobs/MonitStatus/config.xml |   4 +-
 .../Core/jobs/PostgresqlBackup/config.xml     |   6 +-
 .../Core/jobs/PostgresqlRestore/config.xml    |   6 +-
 .../Core/jobs/PrometheusBackup/config.xml     |   6 +-
 .../Core/jobs/PrometheusSanpshot/config.xml   |   6 +-
 .../dev/jobs/Core/jobs/RedisBackup/config.xml | 124 +++++++++
 .../jobs/Core/jobs/SwarmBootstrap/config.xml  |   4 +-
 .../DataPipeline/jobs/Bootstrap/config.xml    |   4 +-
 .../jobs/CassandraBackup/config.xml           |   6 +-
 .../jobs/CassandraRestore/config.xml          |   6 +-
 .../jobs/ConsumerLagAlert/config.xml          |   4 +-
 .../jobs/DataproductsAlert/config.xml         |   4 +-
 .../jobs/DruidPostgresBackup/config.xml       |   6 +-
 .../jobs/ElasticsearchBackup/config.xml       |   6 +-
 .../jobs/ElasticsearchRestore/config.xml      |   6 +-
 .../jobs/DataPipeline/jobs/Health/config.xml  |  43 ++++
 .../jobs/InfluxDBBackup/config.xml            |  32 +--
 .../jobs/Influxdb_restore/config.xml          |  85 ++++++
 .../DataPipeline/jobs/KeyRotation/config.xml  |   4 +-
 .../DataPipeline/jobs/MonitDeploy/config.xml  |  60 ++---
 .../jobs/PostgresqlBackup/config.xml          |   6 +-
 .../jobs/PostgresqlRestore/config.xml         |   6 +-
 .../DataPipeline/jobs/RedisBackup/config.xml  | 120 +++++++++
 .../jobs/RedisDumpMonitoring/config.xml       |   4 +-
 .../jobs/RestartSecorJobs/config.xml          | 173 +++++++++++++
 .../jobs/SamzaJobsAlert/config.xml            |  35 ++-
 .../jobs/SamzaJobsAlertProvision/config.xml   |   4 +-
 .../jobs/SamzaJobsKill/config.xml             |   2 +-
 .../jobs/SamzaLogsBackup/config.xml           |   4 +-
 .../jobs/SamzaMonitoringProvision/config.xml  |   4 +-
 .../jobs/SamzaOrphanprocessAlert/config.xml   |  31 ++-
 .../jobs/SamzaThroughputAlert/config.xml      |  62 ++---
 .../jobs/SamzaThroughputProvision/config.xml  |   4 +-
 .../jobs/DataPipeline/jobs/Test/config.xml    |  39 +++
 .../jobs/redis-restore/config.xml             |  86 +++++++
 .../jobs/Bootstrap/config.xml                 |   4 +-
 .../jobs/CassandraBackup/config.xml           |  33 +--
 .../jobs/CassandraRestore/config.xml          |   4 +-
 .../jobs/ElasticsearchBackup/config.xml       |  32 +--
 .../jobs/ElasticsearchRestore/config.xml      |  28 +-
 .../KnowledgePlatform/jobs/Health/config.xml  |  43 ++++
 .../jobs/KeyRotation/config.xml               |   4 +-
 .../jobs/MonitDeploy/config.xml               |   4 +-
 .../jobs/MonitStatus/config.xml               |   4 +-
 .../jobs/Neo4jBackup/config.xml               |  30 ++-
 .../jobs/Neo4jRestore/config.xml              |   4 +-
 .../jobs/RedisBackup/config.xml               |  32 +--
 .../jobs/RedisRetore/config.xml               | 123 +++++++++
 deploy/jenkins/jobs/Provision/config.xml      |   8 +-
 .../dev/jobs/Core/jobs/Cassandra/config.xml   |  60 ++---
 .../Core/jobs/CassandraExporter/config.xml    | 117 +++++++++
 .../jobs/Core/jobs/JenkinsSlave/config.xml    |   4 +-
 .../jobs/dev/jobs/Core/jobs/Kafka/config.xml  |   4 +-
 .../dev/jobs/Core/jobs/Keycloak/config.xml    |  56 ++--
 .../jobs/Core/jobs/LogEsUpgrade6xx/config.xml |  60 ++---
 .../dev/jobs/Core/jobs/Logstash/config.xml    |   4 +-
 .../dev/jobs/Core/jobs/Postgres/config.xml    |  64 ++---
 .../Core/jobs/PostgresDbUpdate/config.xml     |  60 ++---
 .../jobs/PostgresDbUpdateManaged/config.xml   |   4 +-
 .../jobs/dev/jobs/Core/jobs/Redis/config.xml  | 127 +++++++++
 .../dev/jobs/Core/jobs/Registry/config.xml    |   4 +-
 .../jobs/dev/jobs/Core/jobs/Secor/config.xml  |   4 +-
 .../jobs/Core/jobs/keycloak-test/config.xml   |   4 +-
 .../jobs/Core/jobs/user-keycloak/config.xml   |   4 +-
 .../DataPipeline/jobs/AnalyticsAPI/config.xml |  26 +-
 .../jobs/AnalyticsSecor/config.xml            |  64 ++---
 .../jobs/AnalyticsSpark/config.xml            |  56 ++--
 .../DataPipeline/jobs/Cassandra/config.xml    |   4 +-
 .../jobs/DataPipeline/jobs/Druid/config.xml   |  53 +++-
 .../DataPipeline/jobs/InfluxDB/config.xml     |   4 +-
 .../jobs/DataPipeline/jobs/Kafka/config.xml   |  62 ++---
 .../jobs/DataPipeline/jobs/Kibana/config.xml  |   4 +-
 .../DataPipeline/jobs/MLWorkbench/config.xml  |   4 +-
 .../jobs/DataPipeline/jobs/NodeJs/config.xml  |   4 +-
 .../DataPipeline/jobs/Postgres/config.xml     |   4 +-
 .../DataPipeline/jobs/RedisCluster/config.xml |   4 +-
 .../jobs/TelemetrySearch/config.xml           |   4 +-
 .../jobs/DataPipeline/jobs/Yarn/config.xml    |  58 ++---
 .../DataPipeline/jobs/Zookeeper/config.xml    |  26 +-
 .../jobs/postgres-managed/config.xml          |  56 ++--
 .../jobs/Cassandra/config.xml                 |   4 +-
 .../jobs/CompositeSearch/config.xml           |  58 +++--
 .../KnowledgePlatform/jobs/Dial/config.xml    | 127 +++++++++
 .../KnowledgePlatform/jobs/Kafka/config.xml   |  60 ++---
 .../jobs/Learning/config.xml                  |  62 ++---
 .../KnowledgePlatform/jobs/Neo4j/config.xml   |  60 ++---
 .../KnowledgePlatform/jobs/Redis/config.xml   |  58 ++---
 .../jobs/RedisCluster/config.xml              |   4 +-
 .../KnowledgePlatform/jobs/Search/config.xml  |   4 +-
 .../KnowledgePlatform/jobs/Yarn/config.xml    |   4 +-
 .../jobs/Zookeeper/config.xml                 |  64 ++---
 .../ansible/inventory/dev/Core/common.yml     | 110 ++++----
 private_repo/ansible/inventory/dev/Core/hosts | 128 +++-------
 .../ansible/inventory/dev/Core/secrets.yml    |  25 +-
 .../inventory/dev/DataPipeline/common.yml     |  33 ++-
 .../ansible/inventory/dev/DataPipeline/hosts  | 126 +++++----
 .../inventory/dev/DataPipeline/secrets.yml    |  25 +-
 .../dev/KnowledgePlatform/common.yml          |  29 ++-
 .../inventory/dev/KnowledgePlatform/hosts     |  60 +++--
 .../dev/KnowledgePlatform/secrets.yml         |   5 +
 .../inventory/dev/Kubernetes/common.yml       |   1 +
 .../ansible/inventory/dev/Kubernetes/hosts    |   1 +
 .../inventory/dev/Kubernetes/secrets.yml      |   1 +
 421 files changed, 22991 insertions(+), 4010 deletions(-)
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Analytics/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Bot/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraStateValidated/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Groups/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Hawkeye-superset/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Report/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Router/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Search/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Taxonomy/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataReplay/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/jobs/Content/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LP_Decoupling_Test/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraStateValidated/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InfraMonitoring/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManagerEcho/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/ApplicationElasticSearch/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDecrypt/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/certTemplate/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/EsReindexing/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
 create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisRetore/config.xml
 create mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/CassandraExporter/config.xml
 create mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml
 create mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
 create mode 120000 private_repo/ansible/inventory/dev/Kubernetes/common.yml
 create mode 120000 private_repo/ansible/inventory/dev/Kubernetes/hosts
 create mode 120000 private_repo/ansible/inventory/dev/Kubernetes/secrets.yml

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index 65eb1db11..423ac116e 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -110,8 +110,8 @@ sunbird_cassandra_host: "{{groups['cassandra']|join(',')}}"  #Private IP of Cass
 sunbird_es_host: "{{groups['es']| join(',')}}"
 
 ## Application server configurations
-sunbird_analytics_api_base_url: "http://{{analyticsapi_ip}}:9000"
-sunbird_search_service_api_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9004"
+sunbird_analytics_api_base_url: "analytics-service.{{namespace}}.svc.cluster.local:9000"
+sunbird_search_service_api_base_url: "http://{{private_ingressgateway_ip}}/search"
 sunbird_mail_server_host: "{{ mail_server_host }}"  #SMTP server IP. Could be ignored if not mails are to be sent.
 sunbird_mail_server_port: "{{ mail_server_port }}" #SMTP port. Could be ignored if not mails are to be sent.
 sunbird_mail_server_username: "{{ mail_server_username }}"  #SMTP username. Could be ignored if not mails are to be sent.
@@ -197,8 +197,8 @@ sunbird_dial_repo_api_key: "{{ core_vault_sunbird_ekstep_api_key }}"
 sunbird_plugin_repo_api_base_url: "{{ sunbird_search_service_api_base_url }}"
 sunbird_data_service_api_base_url: "{{sunbird_ekstep_api_base_url}}"
 sunbird_data_service_api_key: "{{ core_vault_sunbird_ekstep_api_key }}"
-sunbird_content_service_api_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9002"
-sunbird_user_service_api_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9000"
+sunbird_content_service_api_base_url: "http://{{private_ingressgateway_ip}}/content"
+sunbird_user_service_api_base_url: "http://{{private_ingressgateway_ip}}/learner"
 sunbird_group_service_api_base_url: "http://groups-service:9000"
 
 #API Manager
@@ -262,7 +262,7 @@ enable_scraping_docker_metrics: false
 postgres_exporter_postgres_port: 5432
 postgres_exporter_user: postgres_exporter
 sunbird_cs_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:5000"
-sunbird_user_service_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9000"
+sunbird_user_service_base_url: "http://{{private_ingressgateway_ip}}/learner"
 kong_admin_api_url: http://localhost:8001
 
 
@@ -342,7 +342,7 @@ sunbird_device_register_api: "{{proto}}://{{api_proxy_name}}/v3/device/register/
 sunbird_course_batch_notification_signature: sunbird
 
 sunbird_authorization: "{{core_vault_sunbird_api_auth_token}}"
-sunbird_lms_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:8000"
+sunbird_lms_base_url: "http://{{private_ingressgateway_ip}}/api"
 sunbird_content_service_local_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:5000"
 sunbird_kafka_host: "{{sunbird_processing_kafka_host}}"
 sunbird_qrimage_topic: "{{env}}.qrimage.request"
@@ -543,7 +543,7 @@ sunbird_sso_kafka_topic: "{{env_name}}.lms.sso.events"
 __yarn_host__: "{{ groups['yarn-master'][0] }}"
 zookeepers: "{{groups['zookeeper']|join(':2181,')}}:2181"
 kafka_brokers: "{{groups['processing-cluster-kafka']|join(':9092,')}}:9092"
-__lms_host__: "http://{{sunbird_swarm_manager_lb_ip}}:9000"
+__lms_host__: "http://{{private_ingressgateway_ip}}/learner"
 sunbird_redis_host: "{{ groups['lp-redis'][0] }}"
 
 
@@ -649,3 +649,11 @@ group_activity_agg_cache_enable: false
 
 # nodebb variables
 sunbird_nodebb_storage_key: "{{ core_vault_sunbird_nodebb_storage_key }}"
+kibana_service: kibana.logging.svc.cluster.local:5601
+sunbird_dial_repo_api_base_url: "http://{{dialservice_ip}}:9001"
+
+#report service
+dp_postgres_host: "{{ groups['postgres'][0] }}"
+dp_postgres_db: analytics
+dp_postgres_password: "{{ core_vault_dp_pgdb_password }}"
+dp_postgres_username: analytics
diff --git a/deploy/jenkins/jenkins-plugins-setup.sh b/deploy/jenkins/jenkins-plugins-setup.sh
index 1bc665b7e..b6956c7df 100755
--- a/deploy/jenkins/jenkins-plugins-setup.sh
+++ b/deploy/jenkins/jenkins-plugins-setup.sh
@@ -4,21 +4,21 @@ normal=$(tput sgr0)
 
 if [[ ! -d /var/lib/jenkins/.m2 ]]; then
 echo -e "\n\e[0;32m${bold}Downloading and copying m2 directory to Jenkins ${normal}"
-wget https://sunbirdpublic.blob.core.windows.net/installation/m2_updated.zip
-unzip m2_updated.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/m2_new.zip
+unzip m2_new.zip
 mv .m2 /var/lib/jenkins
 chown -R jenkins:jenkins /var/lib/jenkins/.m2
 fi
 
 echo -e "\n\e[0;32m${bold}Downloading and copying jenkins plugin directory to Jenkins ${normal}"
 if [[ ! -d /var/lib/jenkins/plugins ]]; then
-wget https://sunbirdpublic.blob.core.windows.net/installation/JenkinsPlugin.zip
-unzip JenkinsPlugin.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/jenkins-plugins-new.zip
+unzip jenkins-plugins-new.zip
 mv plugins /var/lib/jenkins/
 chown -R jenkins:jenkins /var/lib/jenkins/plugins
 else
-wget https://sunbirdpublic.blob.core.windows.net/installation/JenkinsPlugin.zip
-unzip JenkinsPlugin.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/jenkins-plugins-new.zip
+unzip jenkins-plugins-new.zip
 cp -rf plugins/* /var/lib/jenkins/plugins/
 chown -R jenkins:jenkins /var/lib/jenkins/plugins
 fi
diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh
index c28e87690..61dc03d71 100755
--- a/deploy/jenkins/jenkins-server-setup.sh
+++ b/deploy/jenkins/jenkins-server-setup.sh
@@ -15,7 +15,7 @@ echo -e "\n\e[0;32m${bold}Installating Jenkins${normal}"
 wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | apt-key add -
 apt-add-repository "deb https://pkg.jenkins.io/debian-stable binary/"
 apt-get update
-apt-get install -y jenkins=2.190.2
+apt-get install -y jenkins=2.263.1
 
 echo -e "\n\e[0;32m${bold}Installating PIP${normal}"
 apt-get install -y python-pip
@@ -128,6 +128,22 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee -a /etc/a
 apt-get update
 apt-get install -y kubectl
 
+#Install yarn 
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+apt update && apt install yarn
+
+wget https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_linux-x64_bin.tar.gz
+tar -xf openjdk-11+28_linux-x64_bin.tar.gz
+mv jdk-11 java-11-openjdk-amd64
+cp -r java-11-openjdk-amd64 /usr/lib/jvm/
+rm -rf java-11-openjdk-amd64 openjdk-11+28_linux-x64_bin.tar.gz
+
+wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+tar -xf apache-maven-3.6.3-bin.tar.gz
+mv apache-maven-3.6.3/bin/mvn /opt/apache-maven-3.6.3/bin/mvn.3.6
+rm -rf apache-maven-3.6.3-bin.tar.gz
+
 echo -e "\n\e[0;32m${bold}Clean up${normal}"
 sudo apt -y autoremove
 
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml
index ca27afff7..92618cba9 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.5.0-rc1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManager/config.xml
index a3e8cbe68..99ae364da 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManager/config.xml
@@ -1,26 +1,25 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,20 +50,21 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/Core/APIManager</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/Core/APIManager</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManagerEcho/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManagerEcho/config.xml
index cc051470f..cb84967fb 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManagerEcho/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManagerEcho/config.xml
@@ -1,26 +1,25 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -29,13 +28,13 @@
         <hudson.model.StringParameterDefinition>
           <name>absolute_job_path</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>Build/Core/APIManagerEcho</defaultValue>
+          <defaultValue>Build/Core/ApiManagerEcho</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,20 +50,21 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/Core/APIManagerEcho</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/Core/ApiManagerEcho</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
index 397432f38..bad9bddc1 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
@@ -1,37 +1,35 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction plugin="pipeline-model-definition@1.3.4.1"/>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction plugin="pipeline-model-definition@1.3.4.1">
+    <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction plugin="pipeline-model-definition@1.6.0"/>
+    <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction plugin="pipeline-model-definition@1.6.0">
       <jobProperties/>
       <triggers/>
       <parameters/>
       <options/>
     </org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>/Build/Core/AdminUtils</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -43,7 +41,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -59,32 +57,33 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/AdminUtils</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -102,7 +101,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -113,4 +112,4 @@ ArtifactRepo - Push the docker image to container registry.
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Analytics/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Analytics/config.xml
new file mode 100644
index 000000000..0e2f5b81b
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Analytics/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/Analytics</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/Analytics</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml
index 99461aa98..dc2b9069b 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Assessment</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
index 7a4b219bb..6e2ea4303 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
@@ -1,26 +1,25 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Badger</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Bot/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Bot/config.xml
new file mode 100644
index 000000000..9d3f277a1
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Bot/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/Bot</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/Bot</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
index e26714086..06ff17040 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Cassandra</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml
index 1dec9c818..72bb8bb86 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/CassandraDecrypt</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraStateValidated/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraStateValidated/config.xml
new file mode 100644
index 000000000..dec55c1df
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraStateValidated/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/CassandraStateValidated</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>build_number</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+              <string>JenkinsJob</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/CassandraStateValidated</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/artifacts/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
index e99180b3a..19b638685 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,19 +7,19 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -51,20 +50,21 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/Core/CassandraTrigger</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/Core/CassandraTrigger</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cert/config.xml
index fc0675046..fbf6fc242 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cert/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cert/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,19 +7,19 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Cert</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
index 418c706b3..4748b3d7b 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/CertRegistryService</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml
new file mode 100644
index 000000000..874765187
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/Config</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/Config</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml
index ff83188c2..3cd813b45 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml
@@ -1,22 +1,21 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Content</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/EncService/config.xml
index 77c780c03..b6ac09120 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/EncService/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/EncService/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,19 +7,19 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/EncService</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Groups/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Groups/config.xml
new file mode 100644
index 000000000..e16303586
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Groups/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/Groups</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/Groups</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Hawkeye-superset/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Hawkeye-superset/config.xml
new file mode 100644
index 000000000..ab8dbb6ef
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Hawkeye-superset/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/Hawkeye-superset</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/Hawkeye-superset</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
index 56e5f8b78..825932b1b 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
@@ -1,26 +1,25 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Keycloak</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
index 1d398f884..b8352ba77 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/KnowledgeMW</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml
index 28100d104..a0f41171e 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Learner</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Lms/config.xml
index eecb2f318..353c7d776 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Lms/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Lms/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Lms</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml
new file mode 100644
index 000000000..e74f85cc5
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/Nodebb</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/Nodebb</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Notification/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Notification/config.xml
index a6f84bf6e..8741ed787 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Notification/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Notification/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Notification</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml
index a0c8fd7a6..d14adf080 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,19 +7,19 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Player</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Print/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Print/config.xml
index df8959b6a..ef761534e 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Print/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Print/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Print</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Proxy/config.xml
index 281955d43..eff80798a 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Proxy/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Proxy/config.xml
@@ -1,26 +1,25 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Proxy</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Report/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Report/config.xml
new file mode 100644
index 000000000..6e6022264
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Report/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/Report</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/Report</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Router/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Router/config.xml
new file mode 100644
index 000000000..2f6dbc4e1
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Router/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/Router</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/Router</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Search/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Search/config.xml
new file mode 100644
index 000000000..c5c50f262
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Search/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/Search</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/Search</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Taxonomy/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Taxonomy/config.xml
new file mode 100644
index 000000000..22173d79e
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Taxonomy/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/Taxonomy</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/Taxonomy</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
index 9bb6a0028..836428207 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
@@ -1,26 +1,25 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Telemetry</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
index 26c03bc49..103b8d979 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,19 +7,19 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,19 +50,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/UserOrg</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Yarn/config.xml
index 846956588..b235988e3 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Yarn/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,19 +7,19 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/Core/Yarn</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml
index ca27afff7..92618cba9 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.5.0-rc1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
new file mode 100644
index 000000000..9a042704a
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/DataPipeline/AdhocScripts</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>build_number</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+              <string>JenkinsJob</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/DataPipeline/AdhocScripts</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml
index 7010abb55..b4458fb7c 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/DataPipeline/Analytics</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
new file mode 100644
index 000000000..6de1a9644
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/DataPipeline/AnalyticsCore</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>build_number</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+              <string>JenkinsJob</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/DataPipeline/AnalyticsCore</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
new file mode 100644
index 000000000..7f16a721f
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/DataPipeline/AnalyticsService</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>build_number</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+              <string>JenkinsJob</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/DataPipeline/AnalyticsService</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
index 2f3f7f3cd..82bdc7efc 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,20 +50,21 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/DataPipeline/ApiModule</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/DataPipeline/ApiModule</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -75,12 +75,12 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
new file mode 100644
index 000000000..f93395f5e
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/DataPipeline/CoreDataProducts</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>build_number</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+              <string>JenkinsJob</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/DataPipeline/CoreDataProducts</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml
index d3a16f329..e23abe6fc 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/DataPipeline/DataPipeline</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataReplay/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataReplay/config.xml
new file mode 100644
index 000000000..fa4592573
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataReplay/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/DataPipeline/DataReplay</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>build_number</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+              <string>JenkinsJob</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/DataPipeline/DataReplay</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
index 309207380..bd031ec62 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/DataPipeline/ETLJobs</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
new file mode 100644
index 000000000..6e67c6378
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/DataPipeline/EdDataProducts</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>build_number</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+              <string>JenkinsJob</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/DataPipeline/EdDataProducts</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
new file mode 100644
index 000000000..d05493d86
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/DataPipeline/FlinkPipelineJobs</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>Build/DataPipeline/FlinkPipelineJobs</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/upload/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
new file mode 100644
index 000000000..953421f03
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=black size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>/Build/DataPipeline/ml-workbench</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=black size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/DataPipeline/MLWorkbench</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
index 7a140ec41..3a215e294 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/DataPipeline/Secor</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
index b2b55dbb5..f954ac1cb 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,19 +7,19 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/KnowledgePlatform/CassandraTrigger</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
new file mode 100644
index 000000000..b3ae96700
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/KnowledgePlatform/Dial</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>build_number</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+              <string>JenkinsJob</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/KnowledgePlatform/Dial</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
new file mode 100644
index 000000000..4742bdeff
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/KnowledgePlatform/FlinkJobs</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>Build/KnowledgePlatform/FlinkJobs</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/upload/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
index 5444de21f..8f9797800 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
@@ -1,22 +1,21 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/KnowledgePlatform/KnowledgePlatform</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index e3162085b..fd7ef6097 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -1,26 +1,25 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/KnowledgePlatform/Neo4j</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
index 02ab22706..6a9af8f80 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/KnowledgePlatform/SyncTool</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index 2d6034541..4d6a32c85 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -1,22 +1,21 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -51,19 +50,20 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>/Build/KnowledgePlatform/Yarn</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
index 3fe005707..969a059c9 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -1,19 +1,18 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -44,21 +43,21 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/Plugins/CollectionEditor</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/Plugins/CollectionEditor</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -69,8 +68,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
index 9b43d7d8f..9215d1024 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -1,19 +1,18 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -44,20 +43,21 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/Plugins/ContentEditor</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/Plugins/ContentEditor</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -68,8 +68,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
index 6dcf3f76b..4f8edb89f 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -1,19 +1,18 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -44,20 +43,21 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/Plugins/ContentPlayer</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/Plugins/ContentPlayer</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -68,8 +68,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
index 0d3a13392..253aeb9d5 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -1,19 +1,18 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -44,20 +43,21 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/Plugins/ContentPlugins</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/Plugins/ContentPlugins</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -68,8 +68,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
index 4f2734409..569336322 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -1,19 +1,18 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -44,20 +43,21 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/Plugins/GenericEditor</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/Plugins/GenericEditor</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -68,8 +68,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -90,4 +90,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/config.xml b/deploy/jenkins/jobs/Build/config.xml
index 6fe3ca0b6..e794546f9 100644
--- a/deploy/jenkins/jobs/Build/config.xml
+++ b/deploy/jenkins/jobs/Build/config.xml
@@ -1,13 +1,8 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.14">
   <actions/>
   <description></description>
-  <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4">
-      <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.13"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
-  </properties>
+  <properties/>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
       <hudson.model.AllView>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/config.xml
index ca27afff7..92618cba9 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.5.0-rc1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
index 2ee272e18..e0d29e22d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
@@ -1,7 +1,6 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
@@ -13,37 +12,41 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.75">
-    <script>node(){
-        build_tag=&quot;1.8.0-gold&quot;
-        name=&quot;kong&quot;
-        node=env.NODE_NAME
-        org=env.hub_org
-       
-     sh &quot;&quot;&quot;
-        docker pull sunbird/kong:1.8.0-gold
-        docker tag sunbird/kong:1.8.0-gold ${org}/${name}:${build_tag}
-        &quot;&quot;&quot;
-writeFile file: &apos;metadata.json&apos;, text: &apos;{ &quot;image_name&quot; : &quot;&apos; + name + &apos;&quot;, &quot;image_tag&quot; : &quot;&apos; + build_tag + &apos;&quot;, &quot;node_name&quot; : &quot;&apos; + node + &apos;&quot;}&apos;
-
-     archiveArtifacts artifacts: &apos;metadata.json&apos;, onlyIfSuccessful: true
-}</script>
-    <sandbox>true</sandbox>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>images/kong/Jenkinsfile.build</scriptPath>
+    <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml
new file mode 100644
index 000000000..a441e6b66
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml
@@ -0,0 +1,38 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.67">
+    <script>node(){
+        build_tag=&quot;1.5.0-gold&quot;
+        name=&quot;echo-server&quot;
+        node=env.NODE_NAME
+        org=env.hub_org
+        
+     sh &quot;&quot;&quot;
+        docker pull sunbird/echo-server:1.5.0-gold
+        docker tag sunbird/echo-server:1.5.0-gold ${org}/echo-server:${build_tag}
+        &quot;&quot;&quot;
+writeFile file: &apos;metadata.json&apos;, text: &apos;{ &quot;image_name&quot; : &quot;echo-server&quot;, &quot;image_tag&quot; : &quot;&apos; + build_tag + &apos;&quot;, &quot;node_name&quot; : &quot;&apos; + node + &apos;&quot;}&apos;
+
+     archiveArtifacts artifacts: &apos;metadata.json&apos;, onlyIfSuccessful: true
+}</script>
+    <sandbox>true</sandbox>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
index 6c04d4987..a26017e13 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,51 +7,65 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.67">
-    <script>node(){
-        build_tag=&quot;1.5.0-gold&quot;
-        name=&quot;adminutil&quot;
-        node=env.NODE_NAME
-        org=env.hub_org
-        
-     sh &quot;&quot;&quot;
-        docker pull sunbird/${name}:${build_tag}
-        docker tag sunbird/${name}:${build_tag} ${org}/${name}:${build_tag}
-        &quot;&quot;&quot;
-writeFile file: &apos;metadata.json&apos;, text: &apos;{ &quot;image_name&quot; : &quot;&apos; + name + &apos;&quot;, &quot;image_tag&quot; : &quot;&apos; + build_tag + &apos;&quot;, &quot;node_name&quot; : &quot;&apos; + node + &apos;&quot;}&apos;
-
-     archiveArtifacts artifacts: &apos;metadata.json&apos;, onlyIfSuccessful: true
-}</script>
-    <sandbox>true</sandbox>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-apimanager-util.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
new file mode 100644
index 000000000..1f6d5991a
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
@@ -0,0 +1,79 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-analytics-service.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
new file mode 100644
index 000000000..96d35d3ab
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
@@ -0,0 +1,73 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-echo-service.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
index 43bed5c85..f23ff671d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,26 +28,27 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -66,7 +66,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
index 145cdd44a..5b2017152 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,44 +28,39 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.75">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.80">
     <script>node(){
-        build_tag=&quot;1.8.0-gold&quot;
-        name=&quot;badger&quot;
+        build_tag="1.8.0-gold"
+        name="badger"
         node=env.NODE_NAME
         org=env.hub_org
         
-     sh &quot;&quot;&quot;
+     sh """
         docker pull sunbird/${name}:${build_tag}
         docker tag sunbird/${name}:${build_tag} ${org}/${name}:${build_tag}
-        &quot;&quot;&quot;
-writeFile file: &apos;metadata.json&apos;, text: &apos;{ &quot;image_name&quot; : &quot;&apos; + name + &apos;&quot;, &quot;image_tag&quot; : &quot;&apos; + build_tag + &apos;&quot;, &quot;node_name&quot; : &quot;&apos; + node + &apos;&quot;}&apos;
+        """
+writeFile file: 'metadata.json', text: '{ "image_name" : "' + name + '", "image_tag" : "' + build_tag + '", "node_name" : "' + node + '"}'
 
-     archiveArtifacts artifacts: &apos;metadata.json&apos;, onlyIfSuccessful: true
+     archiveArtifacts artifacts: 'metadata.json', onlyIfSuccessful: true
 }</script>
     <sandbox>true</sandbox>
   </definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
index c7470f6bf..e93b6d0fb 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,20 +28,21 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.SCMTrigger>
@@ -52,8 +52,8 @@
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,7 +71,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
index 3746907b3..949257c00 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,31 +28,37 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>cassandra_jar_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>groups-service-util-1.0-SNAPSHOT-jar-with-dependencies.jar</string>
+              <string>user-declaration-util-1.0-SNAPSHOT-jar-with-dependencies.jar</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,7 +76,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
new file mode 100644
index 000000000..4c4a7e1b0
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
@@ -0,0 +1,80 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.34">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-utils.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile.stateValidated</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
index 2347b235c..1c1e1a1ef 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
index a867909a6..74e5873c3 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,31 +28,27 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=blue size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,7 +66,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
index bcd353ae7..d226d54c0 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,31 +28,25 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=blue size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,7 +64,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
new file mode 100644
index 000000000..8fc15e875
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
@@ -0,0 +1,84 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.31">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-cloud-storage-sdk.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>true</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
new file mode 100644
index 000000000..842c70c41
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
@@ -0,0 +1,85 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.31">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-config.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>true</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
index 34533b223..7def9cac2 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,31 +28,27 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,7 +66,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
index 013e1a9f8..1113115fa 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.33">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
@@ -28,31 +27,25 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -70,7 +63,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
new file mode 100644
index 000000000..aaf6e8d80
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
@@ -0,0 +1,78 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/groups-service.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
new file mode 100644
index 000000000..1f7728a61
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
@@ -0,0 +1,78 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/Sunbird-Ed/incubator-superset.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
index 75e3f824e..c4f17ac8c 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
@@ -1,13 +1,12 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
@@ -22,20 +21,21 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.SCMTrigger>
@@ -45,8 +45,8 @@
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -64,7 +64,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
index 71e5de7bb..edf3983a7 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -22,35 +21,29 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-content-service.git</url>
+          <url>https://github.com/project-sunbird/knowledge-mw-service.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -64,7 +57,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
index b8d0132a3..8d26ae1f1 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,31 +28,27 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,7 +66,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
index 417df3f39..4aa49ef4d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,30 +28,29 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-course-service</url>
+          <url>https://github.com/project-sunbird/sunbird-course-service.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -66,7 +64,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
new file mode 100644
index 000000000..f02fabb46
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
@@ -0,0 +1,79 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>nodebb_branch</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/build/nodebb/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
index 511ab2d2e..6116cd04f 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,31 +28,25 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=blue size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,7 +64,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
new file mode 100644
index 000000000..94dd96265
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
@@ -0,0 +1,88 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.TimerTrigger>
+          <spec>H 0 * * *</spec>
+        </hudson.triggers.TimerTrigger>
+        <hudson.triggers.SCMTrigger>
+          <spec>H 23 * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-functional-tests.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>lms_service_api_test/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
index 4558b6a43..a7ec05929 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,53 +28,73 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>sunbird_content_editor_artifact_url</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Blob URL for content editor zip file&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue>https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/content-editor-iframe-3.0.0.zip</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>sunbird_collection_editor_artifact_url</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Blob URL for collection editor zip file&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue>https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/collection-editor-iframe-3.0.0.zip</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>sunbird_generic_editor_artifact_url</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Blob URL for generic editor zip file&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue>https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/generic-editor-iframe-2.9.0.zip</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>buildDockerImage</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>true</string>
+              <string>false</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>buildCdnAssests</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>false</string>
+              <string>true</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>cdnUrl</name>
+          <description/>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</url>
+          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -89,7 +108,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -100,4 +119,4 @@
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml
new file mode 100644
index 000000000..133012369
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml
@@ -0,0 +1,60 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.80">
+    <script>node(){
+ansiColor('xterm') {
+  String ANSI_GREEN = "\u001B[32m"
+  String ANSI_NORMAL = "\u001B[0m"
+  String ANSI_BOLD = "\u001B[1m"
+  String ANSI_RED = "\u001B[31m"
+  String ANSI_YELLOW = "\u001B[33m"
+  buildNumber = params.build_number
+  try {
+    copyArtifacts projectName: params.absolute_job_path, fingerprintArtifacts: true, flatten: true, selector: specific(buildNumber)
+  }
+  catch (err) {
+    println ANSI_YELLOW + ANSI_BOLD + "Ok that failed!. Lets try an alertnative.." + ANSI_NORMAL
+    copyArtifacts projectName: params.absolute_job_path, flatten: true, selector: upstream()
+  }
+  stage('ArchiveArtifacts') {
+    archiveArtifacts "metadata.json"
+    currentWs = sh(returnStdout: true, script: 'pwd').trim()
+    image_tag = sh(returnStdout: true, script: 'jq -r .image_tag metadata.json').trim()
+    agent = sh(returnStdout: true, script: 'jq -r .node_name metadata.json').trim()
+    image_name = sh(returnStdout: true, script: 'jq -r .image_name metadata.json').trim()
+    commit_hash = sh(returnStdout: true, script: 'jq -r .commit_hash metadata.json').trim()
+    values = [:]
+    values.put('image_name', image_name)
+    values.put('image_tag', image_tag)
+    values.put('commit_hash', commit_hash)
+    cdn_file_exists = new File("$currentWs/index_cdn.ejs")
+    if (cdn_file_exists.exists()) {
+        archiveArtifacts "index_cdn.ejs, cdn_assets.zip"
+    }
+    currentBuild.description = "${values.image_tag}"
+  }
+}
+}</script>
+    <sandbox>true</sandbox>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
index 2ec508159..0317d4a8b 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -22,31 +21,25 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -64,7 +57,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
index 20e7a55b7..d6a7b60a5 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
@@ -1,19 +1,18 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -22,26 +21,27 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -59,7 +59,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
new file mode 100644
index 000000000..ca135323c
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
@@ -0,0 +1,78 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-report-service</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
new file mode 100644
index 000000000..e5472de67
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
@@ -0,0 +1,78 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/knowledge-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>build/search-service/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
new file mode 100644
index 000000000..d6845b1e7
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
@@ -0,0 +1,78 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/knowledge-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>build/taxonomy-service/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
index 8db1eb374..7d2435574 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,32 +28,25 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -72,7 +64,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -82,5 +74,5 @@
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
-  <disabled>true</disabled>
+  <disabled>false</disabled>
 </flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
index 3b5cc656b..e942a4906 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -14,15 +14,11 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -33,26 +29,12 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
index 76a1d0c7f..903fc54bd 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -29,32 +28,25 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -72,7 +64,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -82,5 +74,5 @@
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
-  <disabled>true</disabled>
+  <disabled>false</disabled>
 </flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml
index 2b6dfdd25..b4e3e19ff 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml
@@ -1,13 +1,13 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.5.0-rc1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
-    <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.6.2">
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+    <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.6.3">
       <configs class="sorted-set">
         <comparator class="org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty$1"/>
       </configs>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
new file mode 100644
index 000000000..7fadcf6e9
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
@@ -0,0 +1,68 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/Sunbird-Ed/sunbird-data-products.git</url>
+          <credentialsId>githubHarsha</credentialsId>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>python-scripts/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
index ce25972cb..b5f6fe737 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -14,16 +14,12 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -34,30 +30,16 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-analytics.git</url>
+          <url>https://github.com/project-sunbird/sunbird-core-dataproducts.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
new file mode 100644
index 000000000..6c0648ca6
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
@@ -0,0 +1,80 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-analytics-core</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
new file mode 100644
index 000000000..49b4a521a
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
@@ -0,0 +1,67 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-analytics-service.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
index 79fbc9b23..2ba32367d 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -14,16 +14,12 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -34,26 +30,12 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
new file mode 100644
index 000000000..550b6da99
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
@@ -0,0 +1,80 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-core-dataproducts.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
index 17afc4067..0777c5d77 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -14,16 +14,12 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -34,26 +30,12 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
new file mode 100644
index 000000000..2cc421723
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
@@ -0,0 +1,68 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/sowmya-dixit/sunbird-data-products.git</url>
+          <credentialsId>githubHarsha</credentialsId>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>replay-scripts/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
index 5de7b91e0..94e0a87ee 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
@@ -1,7 +1,6 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
@@ -13,27 +12,28 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <url>https://github.com/sunbird-Ed/sunbird-data-products.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -45,7 +45,7 @@
       <submoduleCfg class="list"/>
       <extensions/>
     </scm>
-    <scriptPath>pipelines/build/adhoc-jobs/Jenkinsfile</scriptPath>
+    <scriptPath>etl-jobs/build.Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
new file mode 100644
index 000000000..4c52f1ccf
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
@@ -0,0 +1,80 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/Sunbird-Ed/sunbird-data-products.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>data-products/build.Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
new file mode 100644
index 000000000..037195360
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -0,0 +1,78 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/build/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
index 35dfa6393..e17986031 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -14,16 +14,12 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -34,25 +30,12 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -81,4 +64,4 @@
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/config.xml
new file mode 100644
index 000000000..5be56a4e0
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Experiments/config.xml
@@ -0,0 +1,29 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.8">
+  <actions/>
+  <description></description>
+  <properties>
+    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
+      <dockerLabel></dockerLabel>
+      <registry plugin="docker-commons@1.14"/>
+    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+  </properties>
+  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
+    <views>
+      <hudson.model.AllView>
+        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
+        <name>All</name>
+        <filterExecutors>false</filterExecutors>
+        <filterQueue>false</filterQueue>
+        <properties class="hudson.model.View$PropertyList"/>
+      </hudson.model.AllView>
+    </views>
+    <tabBar class="hudson.views.DefaultViewsTabBar"/>
+  </folderViews>
+  <healthMetrics>
+    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+      <nonRecursive>false</nonRecursive>
+    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+  </healthMetrics>
+  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
+</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml
new file mode 100644
index 000000000..37e2c9b17
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml
@@ -0,0 +1,29 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+  <actions/>
+  <description></description>
+  <properties>
+    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.9">
+      <dockerLabel></dockerLabel>
+      <registry plugin="docker-commons@1.15"/>
+    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+  </properties>
+  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
+    <views>
+      <hudson.model.AllView>
+        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
+        <name>All</name>
+        <filterExecutors>false</filterExecutors>
+        <filterQueue>false</filterQueue>
+        <properties class="hudson.model.View$PropertyList"/>
+      </hudson.model.AllView>
+    </views>
+    <tabBar class="hudson.views.DefaultViewsTabBar"/>
+  </folderViews>
+  <healthMetrics>
+    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+      <nonRecursive>false</nonRecursive>
+    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+  </healthMetrics>
+  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
+</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml
new file mode 100644
index 000000000..37e2c9b17
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml
@@ -0,0 +1,29 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+  <actions/>
+  <description></description>
+  <properties>
+    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.9">
+      <dockerLabel></dockerLabel>
+      <registry plugin="docker-commons@1.15"/>
+    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+  </properties>
+  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
+    <views>
+      <hudson.model.AllView>
+        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
+        <name>All</name>
+        <filterExecutors>false</filterExecutors>
+        <filterQueue>false</filterQueue>
+        <properties class="hudson.model.View$PropertyList"/>
+      </hudson.model.AllView>
+    </views>
+    <tabBar class="hudson.views.DefaultViewsTabBar"/>
+  </folderViews>
+  <healthMetrics>
+    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+      <nonRecursive>false</nonRecursive>
+    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+  </healthMetrics>
+  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
+</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml
new file mode 100644
index 000000000..471add90f
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml
@@ -0,0 +1,121 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.33">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>exp1</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>exp1</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>portal_branch_name</name>
+          <description></description>
+          <defaultValue>release-2.2.0</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>portal_repo_url</name>
+          <description></description>
+          <defaultValue>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/player-experiments/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml
new file mode 100644
index 000000000..d8dcbf422
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml
@@ -0,0 +1,121 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.33">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>exp2</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>exp2</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>portal_branch_name</name>
+          <description></description>
+          <defaultValue>portal-experiments</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>portal_repo_url</name>
+          <description></description>
+          <defaultValue>https://github.com/G33tha/SunbirdEd-portal.git</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>${portal_repo_url}</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Experiments/experiments.Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml
new file mode 100644
index 000000000..295f773de
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?><flow-definition>
+    <actions/>
+    <description/>
+    <keepDependencies>false</keepDependencies>
+    <properties/>
+    <triggers/>
+    <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition">
+        <scriptPath>experiments/experiments.Jenkinsfile</scriptPath>
+        <lightweight>false</lightweight>
+        <scm class="hudson.plugins.git.GitSCM">
+            <userRemoteConfigs>
+                <hudson.plugins.git.UserRemoteConfig>
+                    <url>https://github.com/G33tha/SunbirdEd-portal.git</url>
+                </hudson.plugins.git.UserRemoteConfig>
+            </userRemoteConfigs>
+            <branches>
+                <hudson.plugins.git.BranchSpec>
+                    <name>portal-experiments</name>
+                </hudson.plugins.git.BranchSpec>
+            </branches>
+            <configVersion>2</configVersion>
+            <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+            <gitTool>Default</gitTool>
+        </scm>
+    </definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml
new file mode 100644
index 000000000..74790c6bf
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml
@@ -0,0 +1,85 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>experiment_job_name</name>
+          <description>job name or experiment name</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>repo_url</name>
+          <description>ex  : https://github.com/${account_name}/SunbirdEd-portal.git</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>branch_name</name>
+          <description></description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <javaposse.jobdsl.plugin.ExecuteDslScripts plugin="job-dsl@1.76">
+      <scriptText>def jobname = &quot;${experiment_job_name}&quot;
+def repo = &quot;${repo_url}&quot;
+def branch = &quot;${branch_name}&quot;
+
+pipelineJob(&quot;Experiments/dev/Experiments/${jobname}&quot;) {
+
+    definition {
+    cpsScm {
+      scm {
+        git {
+          remote { url(repo) }
+          branches(branch)
+          scriptPath(&apos;experiments/experiments.Jenkinsfile&apos;)
+        }
+      }
+   }
+  }
+}</scriptText>
+      <usingScriptText>true</usingScriptText>
+      <sandbox>false</sandbox>
+      <ignoreExisting>false</ignoreExisting>
+      <ignoreMissingFiles>false</ignoreMissingFiles>
+      <failOnMissingPlugin>false</failOnMissingPlugin>
+      <failOnSeedCollision>false</failOnSeedCollision>
+      <unstableOnDeprecation>false</unstableOnDeprecation>
+      <removedJobAction>IGNORE</removedJobAction>
+      <removedViewAction>IGNORE</removedViewAction>
+      <removedConfigFilesAction>IGNORE</removedConfigFilesAction>
+      <lookupStrategy>JENKINS_ROOT</lookupStrategy>
+    </javaposse.jobdsl.plugin.ExecuteDslScripts>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml b/deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml
new file mode 100644
index 000000000..fb78197dd
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml
@@ -0,0 +1,28 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+  <description></description>
+  <properties>
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+      <dockerLabel></dockerLabel>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+  </properties>
+  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
+    <views>
+      <hudson.model.AllView>
+        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
+        <name>All</name>
+        <filterExecutors>false</filterExecutors>
+        <filterQueue>false</filterQueue>
+        <properties class="hudson.model.View$PropertyList"/>
+      </hudson.model.AllView>
+    </views>
+    <tabBar class="hudson.views.DefaultViewsTabBar"/>
+  </folderViews>
+  <healthMetrics>
+    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+      <nonRecursive>false</nonRecursive>
+    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+  </healthMetrics>
+  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
+</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml b/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml
new file mode 100644
index 000000000..fb78197dd
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml
@@ -0,0 +1,28 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+  <description></description>
+  <properties>
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+      <dockerLabel></dockerLabel>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+  </properties>
+  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
+    <views>
+      <hudson.model.AllView>
+        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
+        <name>All</name>
+        <filterExecutors>false</filterExecutors>
+        <filterQueue>false</filterQueue>
+        <properties class="hudson.model.View$PropertyList"/>
+      </hudson.model.AllView>
+    </views>
+    <tabBar class="hudson.views.DefaultViewsTabBar"/>
+  </folderViews>
+  <healthMetrics>
+    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+      <nonRecursive>false</nonRecursive>
+    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+  </healthMetrics>
+  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
+</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/jobs/Content/config.xml
new file mode 100644
index 000000000..3cf2aa50e
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/jobs/Content/config.xml
@@ -0,0 +1,80 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/knowledge-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>functional-tests/content/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/config.xml
index c3548f16c..b4e3e19ff 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/config.xml
@@ -1,13 +1,13 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.9">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
-    <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.6.2">
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+    <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.6.3">
       <configs class="sorted-set">
         <comparator class="org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty$1"/>
       </configs>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
index b7a1b0f5f..e9c657cf3 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,13 +7,13 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
@@ -29,26 +28,25 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -66,7 +64,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
new file mode 100644
index 000000000..fb61d20cc
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -0,0 +1,78 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-dial-service</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
new file mode 100644
index 000000000..41a9eadcd
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -0,0 +1,80 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/knowledge-platform-jobs.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernets/pipelines/build/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
index 01eeb5d51..a33487e18 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,13 +7,13 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
@@ -29,7 +28,7 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -44,25 +43,24 @@
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -76,7 +74,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml
new file mode 100644
index 000000000..8338d7a5c
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml
@@ -0,0 +1,109 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_service_url</name>
+          <description></description>
+          <defaultValue>http://11.2.4.22:8080/learning-service</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_content_creator_password</name>
+          <description></description>
+          <defaultValue>password</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_content_reviewer_password</name>
+          <description></description>
+          <defaultValue>password</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_search_base_url</name>
+          <description></description>
+          <defaultValue>http://11.2.6.6/search</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_dial_base_url</name>
+          <description></description>
+          <defaultValue>https://qa.ekstep.in/api</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_dial_auth_key</name>
+          <description></description>
+          <defaultValue>eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI2MzExMTYwNTMzOGY0Zjc5YTgwZTM3YjcyZjVjMmUwZiJ9.azmj_AHmndeJz0h6yIkOJz1XjeZR6Gzd-OrZzR66I0A</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_cs_uri</name>
+          <description></description>
+          <defaultValue>http://11.2.6.6/content</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-functional-tests.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kp_service_test/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LP_Decoupling_Test/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LP_Decoupling_Test/config.xml
new file mode 100644
index 000000000..288e7b050
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LP_Decoupling_Test/config.xml
@@ -0,0 +1,77 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>profile_id</name>
+          <description>Select the profile_id</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>platform-services</string>
+              <string>learning-services</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/build/learning/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index 4dfbddd06..e8f69cfc3 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,13 +7,13 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
@@ -29,31 +28,25 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,7 +64,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
index 09e72999b..0f8cf822d 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,13 +7,13 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
@@ -29,31 +28,25 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,7 +64,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index b29e9d14e..ff889ff72 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,13 +7,13 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
@@ -29,41 +28,29 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>KnowledgePlatform</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -77,7 +64,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
index 2851393b4..9349be357 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -22,30 +21,31 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-collection-editor</url>
+          <url>https://github.com/project-sunbird/sunbird-collection-editor.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -59,7 +59,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
index 64757a95e..e59dc31c4 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -22,26 +21,27 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -59,7 +59,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
index 2c05092c2..2719e4d27 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -22,26 +21,25 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -59,7 +57,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
index 2c87891f4..b53b66fe2 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -22,26 +21,27 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -59,7 +59,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
index 8e12940dc..c1a37d63e 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -22,26 +21,27 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -59,7 +59,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>false</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/config.xml b/deploy/jenkins/jobs/Deploy/config.xml
index 68477b8ac..e794546f9 100644
--- a/deploy/jenkins/jobs/Deploy/config.xml
+++ b/deploy/jenkins/jobs/Deploy/config.xml
@@ -1,13 +1,8 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.14">
   <actions/>
   <description></description>
-  <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
-      <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.13"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
-  </properties>
+  <properties/>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
       <hudson.model.AllView>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/config.xml
index ca27afff7..92618cba9 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.5.0-rc1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
index 04ef70b57..bf725fd9e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,76 +34,78 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>APIManager</projectName>
+          <projectFullName>Deploy/dev/Core/APIManager</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>APIManager</projectName>
+          <projectFullName>Deploy/dev/Core/APIManager</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/Core/APIManager</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -116,8 +117,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -135,7 +136,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
index c9eb87767..298ff2b71 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml
index 1353dd4e7..bd554ea42 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -58,7 +58,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
             </secureFallbackScript>
           </script>
           <projectName>Assessment</projectName>
-          <projectFullName>Deploy/dev/Core_disabled/Assessment</projectFullName>
+          <projectFullName>Deploy/dev/Core/Assessment</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -85,7 +85,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
             </secureFallbackScript>
           </script>
           <projectName>Assessment</projectName>
-          <projectFullName>Deploy/dev/Core_disabled/Assessment</projectFullName>
+          <projectFullName>Deploy/dev/Core/Assessment</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -127,7 +127,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.7.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml
index 139322e5f..5bdde924e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -116,7 +116,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.2.0_RC11</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
index 54d79c38f..76712ca41 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
new file mode 100644
index 000000000..e166158a8
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
@@ -0,0 +1,94 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description>Migration from QUML version 0.5 to QUML version 1.0</description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_search_service_base_path</name>
+          <description>kp_search_service_base_path  http://11.2.6.6/search</description>
+          <defaultValue>http://11.2.6.6/search</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_learning_service_base_path</name>
+          <description>kp_learning_service_base_path  http://11.2.4.22:8080/learning-service</description>
+          <defaultValue>http://11.2.4.22:8080/learning-service</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_assessment_service_base_path</name>
+          <description>kp_assessment_service_base_path:  http://11.2.6.6/assessment</description>
+          <defaultValue>http://11.2.6.6/assessment</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_content_service_base_path</name>
+          <description>kp_content_service_base_path  http://11.2.6.6/content</description>
+          <defaultValue>http://11.2.6.6/content</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color="red"&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>quml-mogration-2.10</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraStateValidated/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraStateValidated/config.xml
new file mode 100644
index 000000000..dcdd0db0d
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraStateValidated/config.xml
@@ -0,0 +1,214 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.34">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/CassandraStateValidated</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9600649228560</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>return[
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraStateValidated</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>build_number</name>
+          <description></description>
+          <randomName>choice-parameter-9600651313765</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+{ 
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraStateValidated</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>artifact_version</name>
+          <description></description>
+          <randomName>choice-parameter-9600653373369</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+} 
+else {
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraStateValidated</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraStateValidated</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraStateValidated</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec></spec>
+          <upstreamProjects>ArtifactUpload/dev/Core/CassandraStateValidated</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/cassandra-deploy/Jenkinsfile.stateValidated</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
index 9fb0436c4..82b8b8a6b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml
index 5713bdacb..cf9509468 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
index 44e278d0d..ee1bfcb08 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml
new file mode 100644
index 000000000..40c3e9754
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml
@@ -0,0 +1,137 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.31">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Config</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.53">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.53">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Config</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.53">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.53">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Config</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/config-service/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml
index c7253c951..821fb2fbf 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,77 +34,78 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Content</projectName>
           <projectFullName>Deploy/dev/Core/Content</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Content</projectName>
           <projectFullName>Deploy/dev/Core/Content</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/Core/Content</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -117,8 +117,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -127,7 +127,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>sc-1928</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -136,7 +136,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml
index 46fec0d7d..307fc4c50 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml
index f53155770..bd98aec0f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,71 +25,74 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188157054642539</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaSetup</projectName>
+          <projectFullName>Deploy/dev/Core/KafkaSetup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188157057910170</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaSetup</projectName>
+          <projectFullName>Deploy/dev/Core/KafkaSetup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_UNORDERED_LIST</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -99,7 +101,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.4.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -108,7 +110,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml
new file mode 100644
index 000000000..0038bd043
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml
@@ -0,0 +1,115 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-196487835595646</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KeycloakAddClients</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-196487838166797</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KeycloakAddClients</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/keycloak/Jenkinsfile.custom</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml
new file mode 100644
index 000000000..0cdecbe4f
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml
@@ -0,0 +1,173 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9600649228560</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>return[
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KeycloakMigration</projectName>
+          <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>build_number</name>
+          <description></description>
+          <randomName>choice-parameter-9600651313765</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+{ 
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KeycloakMigration</projectName>
+          <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>artifact_version</name>
+          <description></description>
+          <randomName>choice-parameter-9600653373369</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+} 
+else {
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KeycloakMigration</projectName>
+          <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KeycloakMigration</projectName>
+          <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.7.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>pipelines/deploy/keycloak-migration/Jenkinsfile</scriptPath>
+    <lightweight>true</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml
index 78de0730d..7eb30d0c1 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,92 +7,95 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-186662917593857</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KeycloakRealm</projectName>
+          <projectFullName>Deploy/dev/Core/KeycloakRealm</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-186662921061407</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KeycloakRealm</projectName>
+          <projectFullName>Deploy/dev/Core/KeycloakRealm</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -111,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
index c355d4b94..46e23f702 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -127,7 +127,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.9.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
index db227c473..406390f30 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,77 +34,78 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Learner</projectName>
           <projectFullName>Deploy/dev/Core/Learner</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Learner</projectName>
           <projectFullName>Deploy/dev/Core/Learner</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/Core/Learner</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -117,8 +117,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -127,7 +127,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.2.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -136,7 +136,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml
index 580fb9c89..c63aa7263 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,77 +34,78 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Lms</projectName>
           <projectFullName>Deploy/dev/Core/Lms</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Lms</projectName>
           <projectFullName>Deploy/dev/Core/Lms</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/Core/Lms</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -117,8 +117,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -127,7 +127,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>summary-aggregate</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -136,7 +136,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml
index 70c06dbdc..0bf64894b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml
@@ -6,10 +6,10 @@
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>10</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml
index 40ece3d11..8a028a777 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml
index 5d8bcbb80..dcab0240d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -19,56 +18,56 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-186775018293883</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Monitoring</projectName>
           <projectFullName>Deploy/dev/Core/Monitoring</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-186775024902722</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Monitoring</projectName>
           <projectFullName>Deploy/dev/Core/Monitoring</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
@@ -92,18 +91,19 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -112,7 +112,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>sunbird-monitoring-release-3.5.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -121,7 +121,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml
index ccf3d0f4a..659441700 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml
index a90507de4..6bbe79142 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml
@@ -6,10 +6,10 @@
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>10</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml
index 7e9662ce0..a122d804d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -96,12 +96,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.7.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml
index d1a4d4cfc..44efa4f3e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -94,7 +94,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.7.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
index 04b4bc73b..6b5fd45cb 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -35,75 +34,78 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Player</projectName>
+          <projectFullName>Deploy/dev/Core/Player</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Player</projectName>
+          <projectFullName>Deploy/dev/Core/Player</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>Deploy/dev/Core/PlayerCDN</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -115,8 +117,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -134,7 +136,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml
index c7d437a52..1a32fe801 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -38,13 +38,13 @@
           <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -52,7 +52,7 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
+            <secureFallbackScript plugin="script-security@1.71">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -64,13 +64,13 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -79,7 +79,7 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
+            <secureFallbackScript plugin="script-security@1.71">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -107,6 +107,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
@@ -123,8 +124,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -152,5 +153,5 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
 </flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml
index d6239bef9..a59ba36be 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -127,7 +127,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.7.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml
index b41cfe595..686734361 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -28,75 +27,78 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Proxy</projectName>
+          <projectFullName>Deploy/dev/Core/Proxy</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Proxy</projectName>
+          <projectFullName>Deploy/dev/Core/Proxy</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/Core/Proxy</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -108,8 +110,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -127,7 +129,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml
index 3e98e5237..915daeeb8 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
index d41ac682b..122d8aded 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml
index 3f59f70e3..ef548d986 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
index 557e5f459..c0cd9f5f4 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml
new file mode 100644
index 000000000..e14279a74
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml
@@ -0,0 +1,234 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.34">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Yarn</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9061667106947</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>return[
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>build_number</name>
+          <description></description>
+          <randomName>choice-parameter-9061670571657</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+{ 
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>artifact_version</name>
+          <description></description>
+          <randomName>choice-parameter-9061673103864</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+} 
+else {
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+          <name>job_names_to_deploy</name>
+          <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the samza app names to deploy and this will kill the selected samza app and deploy them. Multi selection is available.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-8026182213525059</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>return [&apos;lms.user-account-merger_1&apos;,
+&apos;lms.sso-account-updater_1&apos;,
+&apos;lms.indexer_1&apos;]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>PT_MULTI_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/yarn/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
new file mode 100644
index 000000000..bd1b7a068
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
@@ -0,0 +1,138 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlineInstaller</projectName>
+          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlineInstaller</projectName>
+          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>sunbirded_installer_branch_or_tag</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbirded offline installer repo [ &lt;u&gt;https://github.com/Sunbird-Ed/sunbird-desktop-app.git&lt;/u&gt; ] for the build job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>release-2.6.0</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>offline_installer_type</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the type of installer you wanted to build&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>linux64bit</string>
+              <string>windows64bit</string>
+              <string>windows32bit</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>test</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml
new file mode 100644
index 000000000..5d2d3a182
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml
@@ -0,0 +1,135 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.34">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlinewindowstest32</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlinewindowstest32</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>sunbirded_installer_branch_or_tag</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbirded offline installer repo [ &lt;u&gt;https://github.com/Sunbird-Ed/sunbird-desktop-app.git&lt;/u&gt; ] for the build job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>release-2.1</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>offline_installer_type</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the type of installer you wanted to build&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>windows32bit</string>
+              <string>windows64bit</string>
+              <string>linux64bit</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml
new file mode 100644
index 000000000..137949d93
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml
@@ -0,0 +1,135 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.34">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlinewindowstest64</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>offlinewindowstest64</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>sunbirded_installer_branch_or_tag</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbirded offline installer repo [ &lt;u&gt;https://github.com/Sunbird-Ed/sunbird-desktop-app.git&lt;/u&gt; ] for the build job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>release-2.1</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>offline_installer_type</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the type of installer you wanted to build&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>windows64bit</string>
+              <string>windows32bit</string>
+              <string>linux64bit</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml
new file mode 100644
index 000000000..1292b42c0
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml
@@ -0,0 +1,214 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9600649228560</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>return[
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>user-Keycloak</projectName>
+          <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>build_number</name>
+          <description></description>
+          <randomName>choice-parameter-9600651313765</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+{ 
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>user-Keycloak</projectName>
+          <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>artifact_version</name>
+          <description></description>
+          <randomName>choice-parameter-9600653373369</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+} 
+else {
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>user-Keycloak</projectName>
+          <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>user-Keycloak</projectName>
+          <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>user-Keycloak</projectName>
+          <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>sunbird_auth_branch_or_tag</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbird auth repo.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>release-1.15_RC9</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/keycloak/Jenkinsfile.user</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml
index ca27afff7..6a4f8d07e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.5.0-rc1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
@@ -17,6 +17,55 @@
         <filterQueue>false</filterQueue>
         <properties class="hudson.model.View$PropertyList"/>
       </hudson.model.AllView>
+      <au.com.centrumsystems.hudson.plugin.buildpipeline.BuildPipelineView plugin="build-pipeline-plugin@1.5.8">
+        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
+        <name>Deployment View</name>
+        <filterExecutors>false</filterExecutors>
+        <filterQueue>false</filterQueue>
+        <properties class="hudson.model.View$PropertyList"/>
+        <consoleOutputLinkStyle>Lightbox</consoleOutputLinkStyle>
+        <triggerOnlyLatestJob>false</triggerOnlyLatestJob>
+        <alwaysAllowManualTrigger>false</alwaysAllowManualTrigger>
+        <showPipelineParameters>false</showPipelineParameters>
+        <rowHeaders class="au.com.centrumsystems.hudson.plugin.buildpipeline.extension.SimpleRowHeader"/>
+        <showPipelineParametersInHeaders>false</showPipelineParametersInHeaders>
+        <columnHeaders class="au.com.centrumsystems.hudson.plugin.buildpipeline.extension.NullColumnHeader"/>
+        <buildCard class="au.com.centrumsystems.hudson.plugin.buildpipeline.extension.StandardBuildCard"/>
+        <startsWithParameters>false</startsWithParameters>
+        <refreshFrequency>3</refreshFrequency>
+        <showPipelineDefinitionHeader>false</showPipelineDefinitionHeader>
+      </au.com.centrumsystems.hudson.plugin.buildpipeline.BuildPipelineView>
+      <hudson.plugins.view.dashboard.Dashboard plugin="dashboard-view@2.12">
+        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
+        <name>dahs</name>
+        <filterExecutors>false</filterExecutors>
+        <filterQueue>false</filterQueue>
+        <properties class="hudson.model.View$PropertyList"/>
+        <jobNames>
+          <comparator class="hudson.util.CaseInsensitiveComparator"/>
+        </jobNames>
+        <jobFilters/>
+        <columns>
+          <hudson.views.StatusColumn/>
+          <hudson.views.WeatherColumn/>
+          <hudson.views.JobColumn/>
+          <hudson.views.LastSuccessColumn/>
+          <hudson.views.LastFailureColumn/>
+          <hudson.views.LastDurationColumn/>
+          <hudson.views.BuildButtonColumn/>
+          <hudson.plugins.favorite.column.FavoriteColumn plugin="favorite@2.3.2"/>
+        </columns>
+        <recurse>false</recurse>
+        <useCssStyle>false</useCssStyle>
+        <includeStdJobList>false</includeStdJobList>
+        <hideJenkinsPanels>false</hideJenkinsPanels>
+        <leftPortletWidth>50%</leftPortletWidth>
+        <rightPortletWidth>50%</rightPortletWidth>
+        <leftPortlets/>
+        <rightPortlets/>
+        <topPortlets/>
+        <bottomPortlets/>
+      </hudson.plugins.view.dashboard.Dashboard>
     </views>
     <tabBar class="hudson.views.DefaultViewsTabBar"/>
   </folderViews>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
new file mode 100644
index 000000000..90b512478
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
@@ -0,0 +1,227 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/DataPipeline/AdhocScripts</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9061667106947</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AdhocScripts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AdhocScripts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-9061670571657</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AdhocScripts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AdhocScripts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-9061673103864</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AdhocScripts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AdhocScripts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AdhocScripts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AdhocScripts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AdhocScripts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AdhocScripts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/DataPipeline/AdhocScripts</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <credentialsId>githubHarsha</credentialsId>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.9.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/datascience/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
index dfe786f73..2a39d1b1f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,158 +31,169 @@
           <defaultValue>ArtifactUpload/dev/DataPipeline/Analytics</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
-          <visibleItemCount>1</visibleItemCount>
+          <visibleItemCount>2</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsAPI</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsAPI</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsAPI</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsAPI</projectFullName>
-          <parameters class="linked-hash-map"/>
+          <parameters class="linked-hash-map">
+            <entry>
+              <string>artifact_source</string>
+              <string>JenkinsJob</string>
+            </entry>
+          </parameters>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsAPI</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsAPI</projectFullName>
-          <parameters class="linked-hash-map"/>
+          <parameters class="linked-hash-map">
+            <entry>
+              <string>artifact_source</string>
+              <string>JenkinsJob</string>
+            </entry>
+          </parameters>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsAPI</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsAPI</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsAPI</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsAPI</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -192,7 +202,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.7.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -201,7 +211,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -211,5 +221,5 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
 </flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
new file mode 100644
index 000000000..aaf1954e3
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
@@ -0,0 +1,239 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/DataPipeline/AnalyticsCore</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9061667106947</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AnalyticsCore</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AnalyticsCore</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-9061670571657</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AnalyticsCore</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AnalyticsCore</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-9061673103864</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AnalyticsCore</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AnalyticsCore</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AnalyticsCore</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AnalyticsCore</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AnalyticsCore</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AnalyticsCore</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>module</name>
+          <description>
+&lt;font color=dimgray size=2&gt;&lt;b&gt;It will deploy only lpa_core_artifacts(analytics-core &amp; analytics-framework) jar.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>framework</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>remote</name>
+          <description/>
+          <defaultValue>spark</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/DataPipeline/AnalyticsCore</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/data-products/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml
index a8ca2905d..f230bc0a3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -48,73 +47,74 @@
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsFetchLogs</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsFetchLogs</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsFetchLogs</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsFetchLogs</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -132,7 +132,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml
index 23e99c74f..06c584479 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml
index 1f1597299..9b5f1d1ae 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -54,77 +53,78 @@
           <defaultValue>analytics-team</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsPopulatePSQLConsumerChannelMapping</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsPopulatePSQLConsumerChannelMapping</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsPopulatePSQLConsumerChannelMapping</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsPopulatePSQLConsumerChannelMapping</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -138,7 +138,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml
index cf23738d9..c67809a5f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -45,9 +44,10 @@
           </choices>
         </hudson.model.ChoiceParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>job_id</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the job id.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <name>batch_identifier</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify The BatchId to Generate report for specific batch&lt;/b&gt;&lt;/font&gt;
+&lt;font color=dimgray size=2&gt;&lt;b&gt;NOTE: Only Applicable if you are running course-metrics and assessment metrics job&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
@@ -68,73 +68,91 @@
           <defaultValue>30</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsReplayJobs</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsReplayJobs</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsReplayJobs</projectName>
           <projectFullName>Deploy/dev/DataPipeline/AnalyticsReplayJobs</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>keyword</name>
+          <description>Optional - Enter a keyword to generate a report for the "program-collection-summary-report" </description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>job_id</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the job id.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>progress-exhaust</string>
+              <string>userinfo-exhaust</string>
+              <string>response-exhaust</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -152,7 +170,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
new file mode 100644
index 000000000..f1b3a45ba
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
@@ -0,0 +1,225 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/DataPipeline/AnalyticsService</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9061667106947</randomName>
+          <visibleItemCount>2</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AnalyticsService</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AnalyticsService</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-9061670571657</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AnalyticsService</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AnalyticsService</projectFullName>
+          <parameters class="linked-hash-map">
+            <entry>
+              <string>artifact_source</string>
+              <string>JenkinsJob</string>
+            </entry>
+          </parameters>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-9061673103864</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AnalyticsService</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AnalyticsService</projectFullName>
+          <parameters class="linked-hash-map">
+            <entry>
+              <string>artifact_source</string>
+              <string>JenkinsJob</string>
+            </entry>
+          </parameters>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AnalyticsService</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AnalyticsService</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AnalyticsService</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/AnalyticsService</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.2.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/analytics-api/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml
index 99fa738f0..d59080aeb 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -102,12 +102,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.8.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml
index e3639ec0f..99d97a99a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -102,12 +102,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>dataproducts-ansible-changes</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
index 940c48fa6..392e4f983 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -150,12 +150,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>proxy-api</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml
index b1efd0f52..312081ee3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,71 +25,74 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188134496458577</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CassandraDbUpdate</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/CassandraDbUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188134511232202</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CassandraDbUpdate</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/CassandraDbUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -108,7 +110,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
new file mode 100644
index 000000000..f459c4832
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
@@ -0,0 +1,238 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/DataPipeline/CoreDataProducts</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9061667106947</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CoreDataProducts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/CoreDataProducts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-9061670571657</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CoreDataProducts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/CoreDataProducts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-9061673103864</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CoreDataProducts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/CoreDataProducts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CoreDataProducts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/CoreDataProducts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CoreDataProducts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/CoreDataProducts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>module</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;It will deploy only lpa_core_dp_artifacts(batch-models &amp; job-manager) jar.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>dataproducts,default-jobs</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>remote</name>
+          <description/>
+          <defaultValue>spark</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/DataPipeline/CoreDataProducts</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/data-products/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml
index 7826dc016..8f09be5bc 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,51 +31,51 @@
           <defaultValue>ArtifactUpload/dev/DataPipeline/Analytics</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>DataProducts</projectName>
           <projectFullName>Deploy/dev/DataPipeline/DataProducts</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -87,23 +86,23 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -114,75 +113,76 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>DataProducts</projectName>
           <projectFullName>Deploy/dev/DataPipeline/DataProducts</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>DataProducts</projectName>
           <projectFullName>Deploy/dev/DataPipeline/DataProducts</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/DataPipeline/Analytics</upstreamProjects>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/DataPipeline/AnalyticsCore</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -193,8 +193,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -212,7 +212,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml
new file mode 100644
index 000000000..2121bb596
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml
@@ -0,0 +1,153 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>container</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the container for data replay.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>prefix</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the prefix for data replay.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>start_date</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the start date. The default value is just a placeholder which can be changed as per need.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>2017-05-01</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>end_date</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the end date. The default value is just a placeholder which can be changed as per need.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>2017-07-11</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>delete_backups</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Boolean field indicating whether to delete backups or not&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>DataReplayJob</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/DataReplayJob</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>DataReplayJob</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/DataReplayJob</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.8.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/data-replay/Jenkinsfile.replay</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml
new file mode 100644
index 000000000..55e382d7a
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml
@@ -0,0 +1,227 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/DataPipeline/DataReplay</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9061667106947</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>return[
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>DataReplayScript</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/DataReplayScript</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>build_number</name>
+          <description></description>
+          <randomName>choice-parameter-9061670571657</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+{ 
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>DataReplayScript</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/DataReplayScript</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>artifact_version</name>
+          <description></description>
+          <randomName>choice-parameter-9061673103864</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+} 
+else {
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>DataReplayScript</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/DataReplayScript</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>DataReplayScript</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/DataReplayScript</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>DataReplayScript</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/DataReplayScript</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec></spec>
+          <upstreamProjects>ArtifactUpload/dev/DataPipeline/DataReplay</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <credentialsId>githubHarsha</credentialsId>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.8.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/data-replay/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml
index 6e006a10c..3d602c216 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,88 +31,95 @@
 Please provide the tag name.
   Provide the comma separated value if you want to give more than 1 tags.[ Ex: clean-cronjobs,cronjobs,update-config ]
 &lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>DataproductsConfigUpdate</projectName>
           <projectFullName>Deploy/dev/DataPipeline/DataproductsConfigUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>DataproductsConfigUpdate</projectName>
           <projectFullName>Deploy/dev/DataPipeline/DataproductsConfigUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>remote</name>
+          <description/>
+          <defaultValue>spark</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.10.1</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,7 +128,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml
index 30f4f7c78..530f33936 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -39,74 +38,77 @@ To stop task:  [stop-task]
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-193684482193674</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>DruidIngestion</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/DruidIngestion</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-193684493817846</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>DruidIngestion</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/DruidIngestion</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -124,7 +126,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml
new file mode 100644
index 000000000..cba7924d7
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml
@@ -0,0 +1,74 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.TimerTrigger>
+          <spec>H 22 1 * *</spec>
+        </hudson.triggers.TimerTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/druid-summary-monthly-ingestion/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml
new file mode 100644
index 000000000..27e6b355d
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml
@@ -0,0 +1,70 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/RevathiKotla/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.8.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/ops/druid/Jenkinsfile.druidsegmentalert</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml
new file mode 100644
index 000000000..f56940d47
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml
@@ -0,0 +1,70 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.8.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/ops/druid/Jenkinsfile.druidingestionalert</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml
new file mode 100644
index 000000000..5315e4d56
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml
@@ -0,0 +1,74 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.TimerTrigger>
+          <spec>H/15 * * * *</spec>
+        </hudson.triggers.TimerTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.8.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/ops/druid/Jenkinsfile.druidsegmentalert</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml
index d6bcdef93..6d9f4e68a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,107 +31,111 @@
           <defaultValue>Deploy/dev/DataPipeline/ETLJobs</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLDruidContentIndexer</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLDruidContentIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLDruidContentIndexer</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLDruidContentIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLDruidContentIndexer</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLDruidContentIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLDruidContentIndexer</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLDruidContentIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
@@ -146,36 +149,37 @@ Default Druid content indexer job will run as cron.&lt;/b&gt;&lt;/font&gt;</desc
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLDruidContentIndexer</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLDruidContentIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <hudson.model.ChoiceParameterDefinition>
           <name>invoke_type</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-If you select the &quot;execute script from the invoke_type drop down then choose which script you want to execute.&quot;&lt;/b&gt;&lt;/font&gt;</description>
+If you select the "execute script from the invoke_type drop down then choose which script you want to execute."&lt;/b&gt;&lt;/font&gt;</description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
               <string>execute-script</string>
@@ -184,15 +188,16 @@ If you select the &quot;execute script from the invoke_type drop down then choos
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.TimerTrigger>
@@ -201,8 +206,8 @@ If you select the &quot;execute script from the invoke_type drop down then choos
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -211,7 +216,7 @@ If you select the &quot;execute script from the invoke_type drop down then choos
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.4.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -220,7 +225,7 @@ If you select the &quot;execute script from the invoke_type drop down then choos
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
index f559a8b30..3951b1ca1 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -46,7 +45,7 @@ Please select the action deploy or execute script.&lt;/b&gt;&lt;/font&gt;</descr
         <hudson.model.ChoiceParameterDefinition>
           <name>script_to_run</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-If you select the &quot;execute script from the invoke_type drop down then choose which script you want to execute.&quot;&lt;/b&gt;&lt;/font&gt;</description>
+If you select the "execute script from the invoke_type drop down then choose which script you want to execute."&lt;/b&gt;&lt;/font&gt;</description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
               <string>USER_CACHE_INDEXER</string>
@@ -56,151 +55,157 @@ If you select the &quot;execute script from the invoke_type drop down then choos
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLJobs</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLJobs</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLJobs</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLJobs</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLJobs</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLJobs</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLJobs</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLJobs</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLJobs</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLJobs</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/DataPipeline/ETLJobs</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -212,8 +217,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -231,7 +236,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml
index 553749d1f..169267af7 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,107 +31,111 @@
           <defaultValue>Deploy/dev/DataPipeline/ETLJobs</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLUserCacheIndexer</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLUserCacheIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLUserCacheIndexer</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLUserCacheIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLUserCacheIndexer</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLUserCacheIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLUserCacheIndexer</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLUserCacheIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
@@ -146,29 +149,30 @@ user cache indexer script will run.&lt;/b&gt;&lt;/font&gt;</description>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ETLUserCacheIndexer</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/ETLUserCacheIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
@@ -182,17 +186,39 @@ Please select the action deploy or execute script.&lt;/b&gt;&lt;/font&gt;</descr
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>date</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+  Mention the Date in (YYYY-MM-DD) formate to load all the user data from this specific date of cassandra to redis&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>"null"</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>user_id</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+  Mention the user id to populate the data in the redis&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>"null"</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>populate_anonymous_user</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+  Mention the true/false to migrate the existing redis user data&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>"false"</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.TimerTrigger>
@@ -201,8 +227,8 @@ Please select the action deploy or execute script.&lt;/b&gt;&lt;/font&gt;</descr
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -220,7 +246,7 @@ Please select the action deploy or execute script.&lt;/b&gt;&lt;/font&gt;</descr
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
new file mode 100644
index 000000000..800cf6995
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
@@ -0,0 +1,238 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/DataPipeline/EdDataProducts</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9061667106947</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>EdDataProducts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/EdDataProducts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-9061670571657</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>EdDataProducts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/EdDataProducts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-9061673103864</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>EdDataProducts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/EdDataProducts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>EdDataProducts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/EdDataProducts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>EdDataProducts</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/EdDataProducts</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>module</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;It will deploy only lpa_core_dp_artifacts(batch-models &amp; job-manager) jar.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ed-dataproducts</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>remote</name>
+          <description/>
+          <defaultValue>spark</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/DataPipeline/EdDataProducts</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/ed-dataproducts/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
new file mode 100644
index 000000000..37878bceb
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -0,0 +1,172 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>FlinkPipelineJobs</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/FlinkPipelineJobs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>FlinkPipelineJobs</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/FlinkPipelineJobs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/DataPipeline/FlinkPipelineJobs</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>job_names_to_deploy</name>
+          <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the job names to deploy. Multi-selection is available.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-1273072434092073</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return['telemetry-extractor',
+'pipeline-preprocessor',
+'druid-validator',
+'assessment-aggregator',
+'content-cache-updater',
+'de-normalization-primary',
+'de-normalization-secondary',
+'user-cache-updater-v2',
+'summary-denormalization',
+'error-denormalization',
+'device-profile-updater']</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>FlinkPipelineJobs</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/FlinkPipelineJobs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_MULTI_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml
new file mode 100644
index 000000000..bfe7fe3b6
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml
@@ -0,0 +1,127 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>GraphitePrometheusExporter</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/GraphitePrometheusExporter</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>GraphitePrometheusExporter</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/GraphitePrometheusExporter</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/provision/graphite-exporter/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InfraMonitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InfraMonitoring/config.xml
new file mode 100644
index 000000000..957182101
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InfraMonitoring/config.xml
@@ -0,0 +1,129 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-188158799721702</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.57">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.57">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Monitoring</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-188158802464010</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.57">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.57">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Monitoring</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec></spec>
+          <upstreamProjects></upstreamProjects>
+          <threshold>
+            <name>FAILURE</name>
+            <ordinal>2</ordinal>
+            <color>RED</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/monitor/DataPipeline/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml
new file mode 100644
index 000000000..371779b6f
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml
@@ -0,0 +1,180 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/APIManager</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9061667106947</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>return[
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>InternalKong</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/InternalKong</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>option</name>
+          <description></description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>onboard-apis</string>
+              <string>onboard-consumers</string>
+              <string>deploy-internal-kong</string>
+              <string>provision-kong-db</string>
+              <string>bootstrap-swarm</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>InternalKong</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/InternalKong</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>InternalKong</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/InternalKong</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/ekstep/sunbird-devops.git</url>
+          <credentialsId>githubPassword</credentialsId>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.10.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/internal-kong/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml
index 906b7afeb..e599b6964 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,82 +25,83 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188153004575082</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaIndexer</projectName>
           <projectFullName>Deploy/dev/DataPipeline/KafkaIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188153015326365</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaIndexer</projectName>
           <projectFullName>Deploy/dev/DataPipeline/KafkaIndexer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>flink-logstash-setup</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -110,7 +110,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml
index 6a96ea641..aa1b537b8 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,73 +25,74 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188157054642539</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaSetup</projectName>
           <projectFullName>Deploy/dev/DataPipeline/KafkaSetup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188157057910170</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaSetup</projectName>
           <projectFullName>Deploy/dev/DataPipeline/KafkaSetup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_UNORDERED_LIST</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -101,7 +101,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.4.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -110,7 +110,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml
new file mode 100644
index 000000000..490a9ba60
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml
@@ -0,0 +1,145 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Logging</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/Logging</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Logging</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/Logging</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>chartname</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>fluentd-elasticsearch</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>logging</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/kaali09/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.2.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/logging/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
new file mode 100644
index 000000000..4772e037c
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -0,0 +1,97 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.31">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=black size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/DataPipeline/ml-workbench</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest built image will be deployed.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec></spec>
+          <upstreamProjects>ArtifactUpload/dev/DataPipeline/ml-workbench</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/ml-workbench/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
index dcfdb361b..2f345e87e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
@@ -1,112 +1,122 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-188158799721702</randomName>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Monitoring</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/Monitoring</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-188158802464010</randomName>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Monitoring</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/Monitoring</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>tag</name>
+          <description/>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>kubeconfigpath</name>
+          <description/>
+          <defaultValue>/var/lib/jenkins/secrets/dp-k8s.yml</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects></upstreamProjects>
-          <threshold>
-            <name>FAILURE</name>
-            <ordinal>2</ordinal>
-            <color>RED</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.5.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -115,15 +125,15 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
+          <reference/>
+          <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/deploy/monitor/DataPipeline/Jenkinsfile</scriptPath>
+    <scriptPath>kubernetes/pipelines/monitoring/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml
new file mode 100644
index 000000000..95b4d9536
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml
@@ -0,0 +1,139 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SummaryDenormStart</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SummaryDenormStart</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SummaryDenormStart</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SummaryDenormStart</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>job_names</name>
+          <description/>
+          <defaultValue>summary-denormalization</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>action</name>
+          <description/>
+          <defaultValue>scaleup_taskmanager,scaleup_jobmanager</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy/Jenkinsfile.startstop</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml
new file mode 100644
index 000000000..6af02c041
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml
@@ -0,0 +1,139 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SummaryDenormStop</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SummaryDenormStop</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SummaryDenormStop</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SummaryDenormStop</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>job_names</name>
+          <description/>
+          <defaultValue>summary-denormalization</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>action</name>
+          <description/>
+          <defaultValue>scaledown_taskmanager,scaledown_jobmanager</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy/Jenkinsfile.startstop</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml
new file mode 100644
index 000000000..547afa219
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml
@@ -0,0 +1,130 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>report_id</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the job id.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RunReportJob</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/RunReportJob</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RunReportJob</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/RunReportJob</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/RevathiKotla/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.2.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/druid-run-report-job/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml
index fa3c7e238..6256fb7ba 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml
@@ -1,26 +1,25 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -32,71 +31,74 @@
           <defaultValue>${branch_or_tag}</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.53">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.53">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>SamzaTelemetrySchemas</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SamzaTelemetrySchemas</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.53">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.53">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>SamzaTelemetrySchemas</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SamzaTelemetrySchemas</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -105,7 +107,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.9.1</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -114,7 +116,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -125,4 +127,4 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml
new file mode 100644
index 000000000..619c3cac5
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml
@@ -0,0 +1,226 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/DataPipeline/Secor</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9061667106947</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SecorFlink</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-9061670571657</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SecorFlink</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-9061673103864</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SecorFlink</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SecorFlink</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SecorFlink</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/DataPipeline/Secor</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/maheshkumargangula/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.1.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/secor/Jenkinsfile.flink</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml
new file mode 100644
index 000000000..182356ec8
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml
@@ -0,0 +1,154 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>report_id</name>
+          <description/>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>report_schedule</name>
+          <description/>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>report_config</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the report config json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>report_filepath</name>
+          <description/>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>report_description</name>
+          <description/>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SubmitReportJob</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SubmitReportJob</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SubmitReportJob</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SubmitReportJob</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.10.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/druid-report-run-job/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
index 7a1bcd77f..1001dab76 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,21 +32,21 @@
           <defaultValue>ArtifactUpload/dev/DataPipeline/DataPipeline</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
-          <visibleItemCount>1</visibleItemCount>
+          <visibleItemCount>2</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>return[
 &apos;JenkinsJob&apos;,
 &apos;ArtifactRepo&apos;
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
+            <secureFallbackScript plugin="script-security@1.71">
               <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -59,13 +59,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
           <description></description>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -75,25 +75,30 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
+            <secureFallbackScript plugin="script-security@1.71">
               <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
           <projectFullName>Deploy/dev/DataPipeline/Yarn</projectFullName>
-          <parameters class="linked-hash-map"/>
+          <parameters class="linked-hash-map">
+            <entry>
+              <string>artifact_source</string>
+              <string>JenkinsJob</string>
+            </entry>
+          </parameters>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
           <description></description>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 } 
@@ -102,25 +107,30 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
+            <secureFallbackScript plugin="script-security@1.71">
               <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
           <projectFullName>Deploy/dev/DataPipeline/Yarn</projectFullName>
-          <parameters class="linked-hash-map"/>
+          <parameters class="linked-hash-map">
+            <entry>
+              <string>artifact_source</string>
+              <string>JenkinsJob</string>
+            </entry>
+          </parameters>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -128,7 +138,7 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
+            <secureFallbackScript plugin="script-security@1.71">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -140,13 +150,13 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -155,7 +165,7 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
+            <secureFallbackScript plugin="script-security@1.71">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -167,13 +177,13 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>job_names_to_deploy</name>
           <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the samza app names to deploy and this will kill the selected samza app and deploy them. Multi selection is available.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-8026182213525059</randomName>
-          <visibleItemCount>1</visibleItemCount>
+          <visibleItemCount>14</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>return [&apos;DeDuplication_1&apos;,
 &apos;DeNormalization_1&apos;,
 &apos;DruidEventsValidator_1&apos;,
@@ -190,7 +200,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
 &apos;DerivedDeDuplication_1&apos;]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
+            <secureFallbackScript plugin="script-security@1.71">
               <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -205,7 +215,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         </org.biouno.unochoice.CascadeChoiceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -213,13 +223,14 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -228,7 +239,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.10.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -247,5 +258,5 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
 </flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml
index 68477b8ac..92618cba9 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.13"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml
index 5dbac7212..d6752cc7a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml
index 651ff3f5d..0700be4aa 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,74 +25,77 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188160224505093</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CassandraDbUpdate</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/CassandraDbUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188160228215280</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CassandraDbUpdate</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/CassandraDbUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -102,7 +104,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.4.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -111,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
index d4d979599..25ea50fff 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ContentTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ContentTool/config.xml
index 71cb4c9b3..21acd2aed 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ContentTool/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ContentTool/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
new file mode 100644
index 000000000..e4c0e725c
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -0,0 +1,226 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/KnowledgePlatform/Dial</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-14760318274338</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Dial</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Dial</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-14760320375443</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Dial</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Dial</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-14760322347747</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Dial</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Dial</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Dial</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Dial</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Dial</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Dial</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/KnowledgePlatform/Dial</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/dial/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ESMapping/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ESMapping/config.xml
index 415af374c..31ab3671b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ESMapping/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ESMapping/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FileSyncTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FileSyncTool/config.xml
index 1a51b321a..282b3a268 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FileSyncTool/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FileSyncTool/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
new file mode 100644
index 000000000..2ade74653
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -0,0 +1,167 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>FlinkJobs</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/FlinkJobs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>FlinkJobs</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/FlinkJobs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/KnowledgePlatform/FlinkJobs</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>job_names_to_deploy</name>
+          <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the job names to deploy. Multi-selection is available.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-1273072434092073</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return['activity-aggregate-updater',
+'relation-cache-updater',
+'post-publish-processor',
+'post-certificate-processor',
+'certificate-generator',
+'certificate-pre-processor']</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>FlinkJobs</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/FlinkJobs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_MULTI_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>flink-fix</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml
new file mode 100644
index 000000000..e8e72223a
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml
@@ -0,0 +1,140 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>InsertQRCode</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/InsertQRCode</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>InsertQRCode</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/InsertQRCode</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>channel_name</name>
+          <description>Provide the channel name</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>date</name>
+          <description>Provide the current date in below format.
+2019-10-17T10:00:00.000</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/dial/Jenkinsfile.insert</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml
index 979e769aa..6aba98d05 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.33">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,74 +25,77 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188161640748171</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaSetup</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/KafkaSetup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188161652021198</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaSetup</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/KafkaSetup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -102,7 +104,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.4.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -111,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
index a5af84b20..a7e85c562 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
@@ -1,22 +1,21 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,51 +31,51 @@
           <defaultValue>ArtifactUpload/dev/KnowledgePlatform/KnowledgePlatform</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-12566219493457</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.75">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Learning</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Learning</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-12566221440336</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.75">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -87,23 +86,23 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-12566223395914</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.75">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -114,74 +113,75 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Learning</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Learning</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Learning</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Learning</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/KnowledgePlatform/KnowledgePlatform</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -193,8 +193,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -203,7 +203,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.5.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -212,7 +212,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
index a12d3f078..cc7259165 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index d631a65b7..672697c8a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,19 +7,19 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -32,153 +31,159 @@
           <defaultValue>ArtifactUpload/dev/KnowledgePlatform/Neo4j</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-13436883643465</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-13436885688258</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-13436888536349</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -196,7 +201,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml
index b2b030f66..85bb8d7f5 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,76 +25,77 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188174424977419</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4jDefinitionUpdate</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Neo4jDefinitionUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188174429374717</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4jDefinitionUpdate</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Neo4jDefinitionUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -104,7 +104,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.4.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -113,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml
index be8578de2..186b91365 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,80 +31,83 @@
           <defaultValue>ArtifactUpload/dev/KnowledgePlatform/SyncTool</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-14175006770414</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4jElasticSearchSyncTool</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Neo4jElasticSearchSyncTool</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-14175008677110</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4jElasticSearchSyncTool</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Neo4jElasticSearchSyncTool</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-14175010584707</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4jElasticSearchSyncTool</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Neo4jElasticSearchSyncTool</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -126,6 +128,10 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
               <string>syncbatch</string>
               <string>migratequestionextproperties</string>
               <string>migrate-dialcodeRequired</string>
+              <string>syncecml</string>
+              <string>migratecoursetype</string>
+              <string>syncdialcodes</string>
+              <string>sync-collection-rel-cache</string>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
@@ -142,74 +148,77 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <defaultValue>--ids</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4jElasticSearchSyncTool</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Neo4jElasticSearchSyncTool</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4jElasticSearchSyncTool</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Neo4jElasticSearchSyncTool</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -218,7 +227,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.4.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -227,7 +236,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
index 434510f8e..67cabd05f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -203,7 +203,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.9.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StartNeo4jCluster/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StartNeo4jCluster/config.xml
index 5e3b9a033..b76e3665b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StartNeo4jCluster/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StartNeo4jCluster/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,92 +7,95 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188176807343905</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>StartNeo4jCluster</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/StartNeo4jCluster</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-188176809967474</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>StartNeo4jCluster</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/StartNeo4jCluster</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -111,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StopNeo4jCluster/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StopNeo4jCluster/config.xml
index 7bb9a7a06..721b7333c 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StopNeo4jCluster/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StopNeo4jCluster/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml
new file mode 100644
index 000000000..bda4633de
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml
@@ -0,0 +1,127 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SyncQRCode</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/SyncQRCode</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>SyncQRCode</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/SyncQRCode</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/dial/Jenkinsfile.sync</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ValidateLearning/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ValidateLearning/config.xml
index 70cf30e77..4384eb1ce 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ValidateLearning/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ValidateLearning/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index af5b7e4c3..b6d9320d4 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,51 +31,51 @@
           <defaultValue>ArtifactUpload/dev/KnowledgePlatform/Yarn</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-2874232768088857</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2874449088885218</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -87,23 +86,23 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2877900313772031</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -114,74 +113,75 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/KnowledgePlatform/Yarn</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -193,8 +193,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -203,7 +203,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.4.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -212,7 +212,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml
new file mode 100644
index 000000000..4506aeec7
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml
@@ -0,0 +1,34 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+  <actions/>
+  <description></description>
+  <properties>
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+      <dockerLabel></dockerLabel>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+    <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.6.3">
+      <configs class="sorted-set">
+        <comparator class="org.jenkinsci.plugins.configfiles.ConfigByIdComparator"/>
+      </configs>
+    </org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty>
+  </properties>
+  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
+    <views>
+      <hudson.model.AllView>
+        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
+        <name>All</name>
+        <filterExecutors>false</filterExecutors>
+        <filterQueue>false</filterQueue>
+        <properties class="hudson.model.View$PropertyList"/>
+      </hudson.model.AllView>
+    </views>
+    <tabBar class="hudson.views.DefaultViewsTabBar"/>
+  </folderViews>
+  <healthMetrics>
+    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+      <nonRecursive>false</nonRecursive>
+    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+  </healthMetrics>
+  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
+</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml
new file mode 100644
index 000000000..fe91de368
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/APIManager</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>APIManager</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/APIManager</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>APIManager</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/APIManager</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>Deploy/dev/Core/APIManager</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManagerEcho/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManagerEcho/config.xml
new file mode 100644
index 000000000..560e0cbce
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManagerEcho/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/APIManagerEcho</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>APIManagerEcho</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/APIManagerEcho</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>APIManagerEcho</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/APIManagerEcho</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>helm-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/APIManagerEcho</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml
new file mode 100644
index 000000000..ebaedb2e3
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/AdminUtils</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AdminUtils</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/AdminUtils</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>AdminUtils</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/AdminUtils</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>helm-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>Deploy/dev/Core/AdminUtils</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml
new file mode 100644
index 000000000..48270103c
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Analytics</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Analytics</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Analytics</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Analytics</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Analytics</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Analytics</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/ApplicationElasticSearch/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/ApplicationElasticSearch/config.xml
new file mode 100644
index 000000000..766a8ce2f
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/ApplicationElasticSearch/config.xml
@@ -0,0 +1,117 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-186487879604743</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="db_restore" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>ApplicationElasticSearch</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/ApplicationElasticSearch</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-186487885338467</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>ApplicationElasticSearch</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/ApplicationElasticSearch</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/application-elasticsearch/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml
new file mode 100644
index 000000000..f0ecf32f7
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Assessment</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Assessment</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Assessment</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Assessment</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Assessment</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Assessment</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
new file mode 100644
index 000000000..5a49dbdce
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
@@ -0,0 +1,156 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Badger</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Badger</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Badger</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Badger</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Badger</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <defaultValue>deploy-badger</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Badger</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml
new file mode 100644
index 000000000..df5bc0fe5
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml
@@ -0,0 +1,127 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>BootstrapCluster</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/BootstrapCluster</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>BootstrapCluster</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/BootstrapCluster</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.8.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/bootstrap_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml
new file mode 100644
index 000000000..86084333e
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml
@@ -0,0 +1,57 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/bootstrap_minimal/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml
new file mode 100644
index 000000000..8445a39d0
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml
@@ -0,0 +1,219 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Cassandra</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9600649228560</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Cassandra</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Cassandra</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-9600651313765</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Cassandra</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Cassandra</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-9600653373369</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Cassandra</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Cassandra</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Cassandra</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Cassandra</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Cassandra</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Cassandra</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Cassandra</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/cassandra-deploy/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml
new file mode 100644
index 000000000..cacaa806f
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml
@@ -0,0 +1,129 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-9675060449018219</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraDBUpdate</projectName>
+          <projectFullName>Deploy/dev/Core/CassandraDBUpdate</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-9675060450520341</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraDBUpdate</projectName>
+          <projectFullName>Deploy/dev/Core/CassandraDBUpdate</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>cql_file_name</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;enter the cql file name from templates folder &lt;br&gt;
+  templates frolder from the ansible role : &lt;br&gt;
+  sunbird-devops/ansible/roles/cassandra-db-update/templates &lt;br&gt;
+  &lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>alter_externalId_table.cql</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/cassandra_db_update/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDecrypt/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDecrypt/config.xml
new file mode 100644
index 000000000..f091b47fb
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDecrypt/config.xml
@@ -0,0 +1,229 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/CassandraDecrypt</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9600649228560</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraDecrypt</projectName>
+          <projectFullName>Deploy/dev/Core/CassandraDecrypt</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-9600651313765</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraDecrypt</projectName>
+          <projectFullName>Deploy/dev/Core/CassandraDecrypt</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-9600653373369</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraDecrypt</projectName>
+          <projectFullName>Deploy/dev/Core/CassandraDecrypt</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraDecrypt</projectName>
+          <projectFullName>Deploy/dev/Core/CassandraDecrypt</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraDecrypt</projectName>
+          <projectFullName>Deploy/dev/Core/CassandraDecrypt</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>cassandra_jar_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>groups-service-util-1.0-SNAPSHOT-jar-with-dependencies.jar</string>
+              <string>user-declaration-util-1.0-SNAPSHOT-jar-with-dependencies.jar</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/CassandraDecrypt</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml
new file mode 100644
index 000000000..e2fa6869f
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Cert</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Cert</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Cert</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Cert</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Cert</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Cert</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml
new file mode 100644
index 000000000..d88da2db6
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/CertRegistryService</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CertRegistry</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/CertRegistry</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CertRegistry</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/CertRegistry</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/CertRegistryService</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml
new file mode 100644
index 000000000..8aa755cdc
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Content</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Content</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Content</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Content</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Content</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Content</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml
new file mode 100644
index 000000000..7c79c007c
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/EncService</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Enc</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Enc</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Enc</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Enc</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/EncService</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
new file mode 100644
index 000000000..3db5484d4
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
@@ -0,0 +1,69 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction plugin="pipeline-model-definition@1.6.0"/>
+    <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction plugin="pipeline-model-definition@1.6.0">
+      <jobProperties/>
+      <triggers/>
+      <parameters/>
+      <options/>
+    </org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.TimerTrigger>
+          <spec>H 23 * * *</spec>
+        </hudson.triggers.TimerTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.10.0</name>
+        </hudson.plugins.git.BranchSpec>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.0.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
new file mode 100644
index 000000000..619cd6c34
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Groups</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Groups</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Groups</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Groups</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Groups</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Groups</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml
new file mode 100644
index 000000000..e9028d14c
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Hawkeye-superset</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Hawkeye-superset</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Hawkeye-superset</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Hawkeye-superset</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Hawkeye-superset</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>helm-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/ArtifactUpload/dev/Core/Hawkeye-superset</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml
new file mode 100644
index 000000000..530f56dfc
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml
@@ -0,0 +1,206 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9600649228560</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Keycloak</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Keycloak</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-9600651313765</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Keycloak</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Keycloak</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-9600653373369</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Keycloak</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Keycloak</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Keycloak</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Keycloak</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Keycloak</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Keycloak</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>sunbird_auth_branch_or_tag</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbird auth repo.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>release-1.15_RC9</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>keycloak-3.2.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>pipelines/deploy/keycloak/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
new file mode 100644
index 000000000..f34b4e974
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
@@ -0,0 +1,173 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9600649228560</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>return[
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KeycloakMigration</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/KeycloakMigration</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>build_number</name>
+          <description></description>
+          <randomName>choice-parameter-9600651313765</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+{ 
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KeycloakMigration</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/KeycloakMigration</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>artifact_version</name>
+          <description></description>
+          <randomName>choice-parameter-9600653373369</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+} 
+else {
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KeycloakMigration</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/KeycloakMigration</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KeycloakMigration</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/KeycloakMigration</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.5.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>pipelines/deploy/keycloak-migration/Jenkinsfile</scriptPath>
+    <lightweight>true</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml
new file mode 100644
index 000000000..89018080d
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/KnowledgeMW</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KnowledgeMW</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/KnowledgeMW</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KnowledgeMW</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/KnowledgeMW</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/KnowledgeMW</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml
new file mode 100644
index 000000000..54d1fa46b
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml
@@ -0,0 +1,136 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KongJWTAdminUtil</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/KongJWTAdminUtil</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>KongJWTAdminUtil</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/KongJWTAdminUtil</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>kong-jwt-create-adminutil</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/kong-jwt-create-adminutil/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml
new file mode 100644
index 000000000..a79a0679a
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Learner</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Learner</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Learner</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Learner</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Learner</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Learner</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml
new file mode 100644
index 000000000..306f28c71
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Lms</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Lms</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Lms</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Lms</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Lms</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Lms</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml
new file mode 100644
index 000000000..f123de45a
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml
@@ -0,0 +1,149 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Logging</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Logging</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Logging</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Logging</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>chartname</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>elasticsearch</string>
+              <string>fluent-bit</string>
+              <string>kibana</string>
+              <string>oauth2-proxy</string>
+              <string>fluentd-elasticsearch</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>logging</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/logging/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml
new file mode 100644
index 000000000..275efa820
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml
@@ -0,0 +1,133 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Monitoring</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Monitoring</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Monitoring</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Monitoring</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>tag</name>
+          <description/>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.5.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/monitoring/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml
new file mode 100644
index 000000000..be00b7b2d
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml
@@ -0,0 +1,133 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>NetworkConfig</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/NetworkConfig</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>NetworkConfig</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/NetworkConfig</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>playbook</name>
+          <description>This parameter is optional. By default the playbook will be deploy_core_service.yml</description>
+          <defaultValue>networkconfig.yaml</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>internal-lb-fix</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/common/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml
new file mode 100644
index 000000000..752aac166
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Nodebb</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Nodebb</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Nodebb</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Nodebb</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Nodebb</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Nodebb</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml
new file mode 100644
index 000000000..f1aec9208
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Notification</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Notification</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Notification</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Notification</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Notification</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Notification</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml
new file mode 100644
index 000000000..a6ec25b00
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml
@@ -0,0 +1,136 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>OnboardAPIs</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/OnboardAPIs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>OnboardAPIs</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/OnboardAPIs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>kong-api</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/onboard-api/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml
new file mode 100644
index 000000000..10044249b
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml
@@ -0,0 +1,117 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-186788940114941</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>OnboardConsumers</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/OnboardConsumers</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-186788943531283</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>OnboardConsumers</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/OnboardConsumers</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/onboard-consumer/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
new file mode 100644
index 000000000..a28bc0763
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Player</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>true</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Player</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Player</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Player</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Player</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>deploy-player</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Player</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile.player</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml
new file mode 100644
index 000000000..a79315647
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Print</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Print</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Print</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Print</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Print</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Print</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml
new file mode 100644
index 000000000..47bf1e8ee
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Report</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Report</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Report</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Report</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Report</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Report</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml
new file mode 100644
index 000000000..0ef53825a
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Search</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Search</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Search</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Search</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Search</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Search</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml
new file mode 100644
index 000000000..ef2a23242
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Taxonomy</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Taxonomy</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Taxonomy</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Taxonomy</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Taxonomy</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Taxonomy</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml
new file mode 100644
index 000000000..ef7c4a9a1
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Telemetry</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Telemetry</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Telemetry</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Telemetry</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Telemetry</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/Telemetry</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml
new file mode 100644
index 000000000..b2dbba035
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml
@@ -0,0 +1,133 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>UploadSchema</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/UploadSchema</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>UploadSchema</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/UploadSchema</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>kp_branch_or_tag</name>
+          <description>This is knowledge platform branch or tag</description>
+          <defaultValue>release-3.4.0</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/schema/knowledge-platform/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml
new file mode 100644
index 000000000..bb6a46257
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml
@@ -0,0 +1,159 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/UserOrg</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>UserOrg</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/UserOrg</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>UserOrg</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/UserOrg</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description></description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec></spec>
+          <upstreamProjects>ArtifactUpload/dev/Core/UserOrg</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml
new file mode 100644
index 000000000..afb0969da
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml
@@ -0,0 +1,241 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Yarn</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-9061667106947</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return[
+'JenkinsJob',
+'ArtifactRepo'
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>build_number</name>
+          <description/>
+          <randomName>choice-parameter-9061670571657</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+{ 
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>artifact_version</name>
+          <description/>
+          <randomName>choice-parameter-9061673103864</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+} 
+else {
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>job_names_to_deploy</name>
+          <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the samza app names to deploy and this will kill the selected samza app and deploy them. Multi selection is available.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-8026182213525059</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return ['lms.user-account-merger_1',
+'lms.sso-account-updater_1',
+'lms.indexer_1',
+'lms.notification-job_1']</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Yarn</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_MULTI_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/yarn/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/certTemplate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/certTemplate/config.xml
new file mode 100644
index 000000000..d02f6bf81
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/certTemplate/config.xml
@@ -0,0 +1,136 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.34">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>certTemplate</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>certTemplate</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>sunbird_util_branch_or_tag</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbird util repo for templates.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>release-2.3.0</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>badgeType</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Select the type of deployment as per your requirement.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>createBadge</string>
+              <string>createIssuer</string>
+              <string>createPublicKey</string>
+              <string>All</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/certs-templates/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml
new file mode 100644
index 000000000..6af233e9f
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml
@@ -0,0 +1,149 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Proxy</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>nginx-private-ingress</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/nginx-private-ingress</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>nginx-private-ingress</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/nginx-private-ingress</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>helm-deploy</string>
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml
new file mode 100644
index 000000000..e24b07952
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml
@@ -0,0 +1,149 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/Proxy</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>nginx-public-ingress</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/nginx-public-ingress</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>nginx-public-ingress</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/nginx-public-ingress</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>helm-deploy</string>
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.4.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
index 8e0643928..0f30f927e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -1,11 +1,10 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -17,150 +16,156 @@
           <defaultValue>ArtifactUpload/dev/Plugins/CollectionEditor</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-620062284617427</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CollectionEditor</projectName>
+          <projectFullName>Deploy/dev/Plugins/CollectionEditor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-620062286335119</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CollectionEditor</projectName>
+          <projectFullName>Deploy/dev/Plugins/CollectionEditor</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-620062288387509</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CollectionEditor</projectName>
+          <projectFullName>Deploy/dev/Plugins/CollectionEditor</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CollectionEditor</projectName>
+          <projectFullName>Deploy/dev/Plugins/CollectionEditor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="${public_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CollectionEditor</projectName>
+          <projectFullName>Deploy/dev/Plugins/CollectionEditor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/Plugins/CollectionEditor</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -172,8 +177,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -182,7 +187,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>editor-chnages</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -191,7 +196,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
index 2206e127f..be250dc94 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -1,7 +1,6 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -17,150 +16,156 @@
           <defaultValue>ArtifactUpload/dev/Plugins/ContentEditor</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-620062284617427</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentEditor</projectName>
+          <projectFullName>Deploy/dev/Plugins/ContentEditor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-620062286335119</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentEditor</projectName>
+          <projectFullName>Deploy/dev/Plugins/ContentEditor</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-620062288387509</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentEditor</projectName>
+          <projectFullName>Deploy/dev/Plugins/ContentEditor</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentEditor</projectName>
+          <projectFullName>Deploy/dev/Plugins/ContentEditor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="${public_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentEditor</projectName>
+          <projectFullName>Deploy/dev/Plugins/ContentEditor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/Plugins/ContentEditor</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -172,8 +177,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -182,7 +187,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>editor-chnages</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -191,7 +196,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
index 999dde5c3..04b82ffeb 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -1,7 +1,6 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -17,51 +16,51 @@
           <defaultValue>ArtifactUpload/dev/Plugins/ContentPlayer</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-620062284617427</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlayer</projectName>
           <projectFullName>Deploy/dev/Plugins/ContentPlayer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-620062286335119</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -72,23 +71,23 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-620062288387509</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -99,73 +98,74 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlayer</projectName>
           <projectFullName>Deploy/dev/Plugins/ContentPlayer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="${public_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlayer</projectName>
           <projectFullName>Deploy/dev/Plugins/ContentPlayer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/Plugins/ContentPlayer</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -177,8 +177,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -196,7 +196,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
index 37fdaa0d4..d3dc97dda 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -1,11 +1,10 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -17,150 +16,156 @@
           <defaultValue>ArtifactUpload/dev/Plugins/ContentPlugins</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-620062284617427</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlugins</projectName>
+          <projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-620062286335119</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlugins</projectName>
+          <projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-620062288387509</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlugins</projectName>
+          <projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlugins</projectName>
+          <projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="${public_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlugins</projectName>
+          <projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/Plugins/ContentPlugins</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -172,8 +177,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -191,7 +196,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
index c4a6262e7..102495eaa 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -1,7 +1,6 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -17,51 +16,51 @@
           <defaultValue>ArtifactUpload/dev/Plugins/GenericEditor</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-620062284617427</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.71">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>GenericEditor</projectName>
           <projectFullName>Deploy/dev/Plugins/GenericEditor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-620062286335119</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -72,23 +71,23 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-620062288387509</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -99,73 +98,74 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>GenericEditor</projectName>
           <projectFullName>Deploy/dev/Plugins/GenericEditor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="${public_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>GenericEditor</projectName>
           <projectFullName>Deploy/dev/Plugins/GenericEditor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/Plugins/GenericEditor</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -177,8 +177,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -187,7 +187,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>editor-chnages</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -196,7 +196,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml
new file mode 100644
index 000000000..73b41059d
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml
@@ -0,0 +1,200 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Plugins/ContentPlugins</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-620062284617427</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.58">
+              <script>return[
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
+]</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>org_sunbird_questionunit_quml</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>build_number</name>
+          <description></description>
+          <randomName>choice-parameter-620062286335119</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.58">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+{ 
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>org_sunbird_questionunit_quml</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>artifact_version</name>
+          <description></description>
+          <randomName>choice-parameter-620062288387509</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.58">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+} 
+else {
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>org_sunbird_questionunit_quml</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>org_sunbird_questionunit_quml</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>org_sunbird_questionunit_quml</projectName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>plugin_name</name>
+          <description></description>
+          <defaultValue>org.sunbird.questionunit.quml-1.0</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/org_sunbird_questionunit_quml/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Summary/jobs/DeployedVersions/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Summary/jobs/DeployedVersions/config.xml
index 2c667ec58..0f9f56f42 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Summary/jobs/DeployedVersions/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Summary/jobs/DeployedVersions/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>10</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/config.xml b/deploy/jenkins/jobs/OpsAdministration/config.xml
index 68477b8ac..92618cba9 100644
--- a/deploy/jenkins/jobs/OpsAdministration/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.13"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml
index 54c8ced7a..fa769962d 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml
index 0f8f73f2d..af8153a6b 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
   <description></description>
   <keepDependencies>false</keepDependencies>
@@ -7,50 +7,65 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <hudson.model.StringParameterDefinition>
+          <name>host</name>
+          <description>&lt;font color=teal size=2&gt;enter any one host name or ip if it is a cluster&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>SNAPSHOT_NUMBER</name>
+          <description>&lt;font color=teal size=2&gt;Enter Snapshot number to restore. 
+curl command to get snapshot number:
+curl http://localhost:9200/_snapshot/azurebackup/_all, Parse the json and get the valid snapshot number to restore&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
-          <randomName>choice-parameter-189745871212329</randomName>
+          <randomName>choice-parameter-193693971284924</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;db_restore&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ApplicationElasticsearchRestore</projectName>
+          <projectFullName>OpsAdministration/dev/Core/ApplicationElasticsearchRestore</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
           <description></description>
-          <randomName>choice-parameter-189745873861032</randomName>
+          <randomName>choice-parameter-193693974507874</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -59,29 +74,18 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ApplicationElasticsearchRestore</projectName>
+          <projectFullName>OpsAdministration/dev/Core/ApplicationElasticsearchRestore</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>host</name>
-          <description>&lt;b color:&quot;#b666d2&quot;&gt;Give the host IP in which you wanted to restore the ES. Do add the host ip in inventory file.&lt;/b&gt;</description>
-          <defaultValue>11.11.11.11</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>snapshot_name</name>
-          <description>&lt;b color:&quot;#b666d2&quot;&gt;Give the Snapshot Name of the snapshot which you want to restore from azure.&lt;/b&gt;</description>
-          <defaultValue>snapshot_1562619680</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
@@ -94,12 +98,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/MasterAlt/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
index 9b168d96d..94af12a44 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml
index 9ceaefbe6..85c852a17 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
   <description></description>
   <keepDependencies>false</keepDependencies>
@@ -7,25 +7,25 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-189743214208409</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -33,24 +33,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CassandraBackup</projectName>
+          <projectFullName>OpsAdministration/dev/Core/CassandraBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-189743216959018</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -59,12 +60,13 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CassandraBackup</projectName>
+          <projectFullName>OpsAdministration/dev/Core/CassandraBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -89,8 +91,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -99,7 +101,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.9.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearDockerImages/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearDockerImages/config.xml
index 0abf0e9bf..77b16591b 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearDockerImages/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearDockerImages/config.xml
@@ -1,22 +1,22 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<project>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><project>
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
@@ -25,14 +25,14 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
     <hudson.triggers.TimerTrigger>
-      <spec>H 2 * * *</spec>
+      <spec>H 5 * * *</spec>
     </hudson.triggers.TimerTrigger>
   </triggers>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>#docker image rm $(docker images | awk &apos;NR&gt;1 {print $3}&apos;) --force 2&gt; /dev/null
-docker system prune -af</command>
+      <command>sudo docker image rm $(sudo docker images | awk 'NR&gt;1 {print $3}') --force
+sudo docker system prune -af</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearWorkspace/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearWorkspace/config.xml
index 087d526b0..912f23767 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearWorkspace/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ClearWorkspace/config.xml
@@ -1,19 +1,22 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<project>
-  <description></description>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><project>
+  <actions/>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
@@ -22,19 +25,33 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
     <hudson.triggers.TimerTrigger>
-      <spec>H 4 * * *</spec>
+      <spec>H 6 * * *</spec>
     </hudson.triggers.TimerTrigger>
   </triggers>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>rm -rf /var/lib/jenkins/workspace/Build
-rm -rf /var/lib/jenkins/workspace/Provision
-rm -rf /var/lib/jenkins/workspace/OpsAdministration
-rm -rf /var/lib/jenkins/workspace/ArtifactUpload
-rm -rf /var/lib/jenkins/workspace/Deploy</command>
+      <command>echo "Before clearing"
+df -h
+curl -XPOST http://$ops@localhost:8080/jenkins/quietDown
+sleep 60
+sudo rm -rf /var/lib/jenkins/workspace/* || true
+sudo rm -rf /tmp/* || true
+sleep 60
+curl -XPOST http://$ops@localhost:8080/jenkins/cancelQuietDown
+echo "After clearing"
+df -h</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>
-  <buildWrappers/>
+  <buildWrappers>
+    <org.jenkinsci.plugins.credentialsbinding.impl.SecretBuildWrapper plugin="credentials-binding@1.22">
+      <bindings>
+        <org.jenkinsci.plugins.credentialsbinding.impl.UsernamePasswordBinding>
+          <credentialsId>ops</credentialsId>
+          <variable>ops</variable>
+        </org.jenkinsci.plugins.credentialsbinding.impl.UsernamePasswordBinding>
+      </bindings>
+    </org.jenkinsci.plugins.credentialsbinding.impl.SecretBuildWrapper>
+  </buildWrappers>
 </project>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
index cfda6e5ec..30e2a224b 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
@@ -1,7 +1,6 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.33">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
@@ -13,30 +12,30 @@
         <hudson.model.StringParameterDefinition>
           <name>instance_name</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Enter ansible group name&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>username</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Enter user name&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>password</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Enter encrypted password&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>public_key</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Enter public key in single quotes&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>tag</name>
-          <description></description>
+          <description/>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
               <string>add-user</string>
@@ -44,80 +43,83 @@
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-189741599993386</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CreateUser</projectName>
+          <projectFullName>OpsAdministration/dev/Core/CreateUser</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-189741602917876</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CreateUser</projectName>
+          <projectFullName>OpsAdministration/dev/Core/CreateUser</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/rjshrjndrn/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>useradd</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -126,7 +128,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml
index 0227b7997..35d9e419f 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -19,54 +18,56 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9675060449018219</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ESMapping</projectName>
+          <projectFullName>OpsAdministration/dev/Core/ESMapping</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9675060450520341</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ESMapping</projectName>
+          <projectFullName>OpsAdministration/dev/Core/ESMapping</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
@@ -85,26 +86,27 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   &lt;br&gt;
   enter all to run all indices and mappings &lt;br&gt;
   &lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -122,7 +124,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/EsReindexing/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/EsReindexing/config.xml
new file mode 100644
index 000000000..eb5bf8353
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/EsReindexing/config.xml
@@ -0,0 +1,91 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><project>
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>esHost</name>
+          <description/>
+          <defaultValue>11.2.3.58</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>oldIndex</name>
+          <description/>
+          <defaultValue>certreg</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>newIndex</name>
+          <description/>
+          <defaultValue>certv2</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>aliasName</name>
+          <description/>
+          <defaultValue>certs</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>indexFileLocation</name>
+          <description/>
+          <defaultValue>sunbird-es-utils/src/main/resources/reindexing/indices/certreg_indices.json</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>mappingFileLocation</name>
+          <description/>
+          <defaultValue>sunbird-es-utils/src/main/resources/reindexing/mappings/certreg_mappings.json</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <url>https://github.com/project-sunbird/sunbird-utils.git</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>release-2.10.0</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <submoduleCfg class="list"/>
+    <extensions/>
+  </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>chmod +x sunbird-es-utils/src/main/resources/reindexing/reindex.sh
+bash sunbird-es-utils/src/main/resources/reindexing/reindex.sh ${esHost} ${oldIndex} ${newIndex} ${aliasName} ${indexFileLocation} ${mappingFileLocation}</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
index 68aafba32..5e891cba0 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -94,7 +94,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml
new file mode 100644
index 000000000..1cd2aa21a
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml
@@ -0,0 +1,43 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>pipelines/deploy/health-check/Jenkinsfile</scriptPath>
+    <lightweight>true</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml
index b09d7e542..c4b347736 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -98,7 +98,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml
index 1880fa9db..c87f70872 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml
index 6d1c763ae..9e18416ad 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml
index 17fa0572d..3d52d256c 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml
index 7982bb2c2..3953efc54 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml
index 51657f25f..74888f8ff 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -19,76 +18,77 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-189733897665665</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>PostgresManagedBackup</projectName>
-          <projectFullName>OpsAdministration/dev/Core/PostgresManagedBackup</projectFullName>
+          <projectName>ManagedPostgresBackup</projectName>
+          <projectFullName>OpsAdministration/dev/Core/ManagedPostgresBackup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-189733901134743</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>PostgresManagedBackup</projectName>
-          <projectFullName>OpsAdministration/dev/Core/PostgresManagedBackup</projectFullName>
+          <projectName>ManagedPostgresBackup</projectName>
+          <projectFullName>OpsAdministration/dev/Core/ManagedPostgresBackup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <hudson.model.StringParameterDefinition>
           <name>postgres_env</name>
-          <description></description>
+          <description/>
           <defaultValue>dev_old</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.TimerTrigger>
@@ -97,8 +97,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -107,7 +107,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.3.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -116,7 +116,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitDeploy/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitDeploy/config.xml
index 413b0297a..e09d90a53 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitDeploy/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitDeploy/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitStatus/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitStatus/config.xml
index 423e81855..fb56faf6f 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitStatus/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/MonitStatus/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml
index c8d49c9cd..11c154f9a 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml
index 994908853..f9a24a2bc 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -90,7 +90,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml
index 62420abc2..1d8cb3e0e 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml
index 497f1633b..768fce6ca 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backup</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml
new file mode 100644
index 000000000..0f5f261ef
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml
@@ -0,0 +1,124 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-193697432119747</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RedisBackup</projectName>
+          <projectFullName>OpsAdministration/dev/Core/RedisBackup</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-193697441891806</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RedisBackup</projectName>
+          <projectFullName>OpsAdministration/dev/Core/RedisBackup</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.TimerTrigger>
+          <spec>H 2 * * *</spec>
+        </hudson.triggers.TimerTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.3.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/backup/redis-backup/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml
index 429a4261f..ef4f2bf6d 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml
index 7b842f76d..b19a70afa 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml
index e99463288..ddae73cc3 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -118,7 +118,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml
index a120e7f0b..fa5bdcbb2 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -109,7 +109,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ConsumerLagAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ConsumerLagAlert/config.xml
index 78c54d89f..4e750b5e1 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ConsumerLagAlert/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ConsumerLagAlert/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DataproductsAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DataproductsAlert/config.xml
index 570cefb6e..39ce90809 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DataproductsAlert/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DataproductsAlert/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml
index b63f0b4eb..995714507 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -98,7 +98,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml
index 068045858..5ea4ae60f 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -112,7 +112,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml
index 26d888332..c3d014087 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -111,7 +111,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml
new file mode 100644
index 000000000..870f36491
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml
@@ -0,0 +1,43 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>pipelines/deploy/health-check/Jenkinsfile-dp</scriptPath>
+    <lightweight>true</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml
index 14d635555..49635f78e 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -14,25 +14,25 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-193686205164304</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -40,24 +40,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>InfluxDBBackup</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/InfluxDBBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-193686227117959</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -66,12 +67,13 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>InfluxDBBackup</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/InfluxDBBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -96,17 +98,17 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <url>https://github.com/MasterAlt/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.9.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -126,4 +128,4 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml
new file mode 100644
index 000000000..9a0942df5
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml
@@ -0,0 +1,85 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>influxdb_host</name>
+          <description>Influxdb ip or hostname where data needs to be restored.</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>influxdb_restore_file_name</name>
+          <description>influxdb backup file name which needs to be restored.</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-4812402663506673</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Influxdb_restore</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/Influxdb_restore</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.9.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>pipelines/backup/influxdb-restore/Jenkinsfile</scriptPath>
+    <lightweight>true</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml
index faaea481f..54a0681dc 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml
index abbec5a20..713e2f38d 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -19,62 +18,62 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-193690420291616</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>MonitDeploy</projectName>
           <projectFullName>OpsAdministration/dev/DataPipeline/MonitDeploy</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-193690422104853</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>MonitDeploy</projectName>
           <projectFullName>OpsAdministration/dev/DataPipeline/MonitDeploy</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <hudson.model.ChoiceParameterDefinition>
           <name>tag</name>
-          <description></description>
+          <description/>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
               <string>all</string>
@@ -92,21 +91,22 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -115,7 +115,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-3.2.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -124,7 +124,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml
index fac30b936..edfc1ee0d 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -90,7 +90,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml
index f3bfd06a6..1369badc4 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -90,7 +90,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml
new file mode 100644
index 000000000..7d3c56036
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml
@@ -0,0 +1,120 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-193697432119747</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RedisBackup</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/RedisBackup</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-193697441891806</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RedisBackup</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/RedisBackup</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>redis-multiprocess</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/backup/redis-backup/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisDumpMonitoring/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisDumpMonitoring/config.xml
index d7cb16b5a..e93b31bd5 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisDumpMonitoring/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisDumpMonitoring/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml
new file mode 100644
index 000000000..002f8f1f8
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml
@@ -0,0 +1,173 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RestartSecorJobs</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/RestartSecorJobs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RestartSecorJobs</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/RestartSecorJobs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>trigger</name>
+          <description>Select the trigger. (Start, Stop or Restart)</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>start</string>
+              <string>stop</string>
+              <string>restart</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>secor_jobs</name>
+          <description>&lt;font color=green size=2&gt;&lt;b&gt;Select the one or multiple secor jobs to start, stop or restart&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-8026182213525059</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return ['extractor-failed-backup',
+'unique-telemetry-backup',
+'denorm-events-backup',
+'learning-failed-backup',
+'ingestion-telemetry-backup',
+'raw-telemetry-backup',
+'pipeline-metrics-backup',
+'channel-telemetry-backup',
+'assess-events-backup',
+'learning-events-backup',
+'device-profile-backup',
+'failed-telemetry-backup',
+'derived-telemetry-backup']</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RestartSecorJobs</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/RestartSecorJobs</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_MULTI_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-2.10.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/ops/secor_restart/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml
index c4a2791b0..6bead98a4 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,13 +26,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-2914866095851737</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
+            <secureScript plugin="script-security@1.71">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -40,24 +40,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
+            <secureFallbackScript plugin="script-security@1.71">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>SamzaJobsAlert</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/SamzaJobsAlert</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-2914866097410763</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
+            <secureScript plugin="script-security@1.71">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -66,20 +67,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
+            <secureFallbackScript plugin="script-security@1.71">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>SamzaJobsAlert</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/SamzaJobsAlert</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.FileParameterDefinition>
+          <name></name>
+          <description></description>
+        </hudson.model.FileParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -87,6 +93,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
@@ -96,8 +103,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -106,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -125,5 +132,5 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
 </flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlertProvision/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlertProvision/config.xml
index 89b09c571..7093c3537 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlertProvision/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlertProvision/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml
index e77ed5775..293f2e6b9 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml
@@ -123,7 +123,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaLogsBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaLogsBackup/config.xml
index 3dc7f04d8..bf3f5750e 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaLogsBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaLogsBackup/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml
index 15ad71d1a..a1cc4ddec 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
index 8146d565f..20c333f60 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
@@ -1,43 +1,42 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>Deploy/dev/DataPipeline/Yarn,Deploy/dev/KnowledgePlatform/Yarn</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -52,8 +51,8 @@
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -62,7 +61,7 @@
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>refs/tags/tag-for-backups</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -71,7 +70,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -82,4 +81,4 @@
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputAlert/config.xml
index d4d40ccfa..bef6b6f25 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputAlert/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputAlert/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,76 +25,81 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2914866095851737</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>SamzaThroughputAlert</projectName>
           <projectFullName>OpsAdministration/dev/DataPipeline/SamzaThroughputAlert</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2914866097410763</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>SamzaThroughputAlert</projectName>
           <projectFullName>OpsAdministration/dev/DataPipeline/SamzaThroughputAlert</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <hudson.model.StringParameterDefinition>
           <name>tag</name>
-          <description></description>
+          <description/>
           <defaultValue>throughput_monitor</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
+        <hudson.model.FileParameterDefinition>
+          <name>/tmp/dialcode.csv</name>
+          <description/>
+        </hudson.model.FileParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.TimerTrigger>
@@ -104,8 +108,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -123,7 +127,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputProvision/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputProvision/config.xml
index 5239bf8be..bf9b1d729 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputProvision/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaThroughputProvision/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml
new file mode 100644
index 000000000..08c7fb9e7
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml
@@ -0,0 +1,39 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><project>
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.FileParameterDefinition>
+          <name>~jenkins</name>
+          <description/>
+        </hudson.model.FileParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders/>
+  <publishers/>
+  <buildWrappers/>
+</project>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml
new file mode 100644
index 000000000..4de167aaf
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml
@@ -0,0 +1,86 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>redis_restore_file_name</name>
+          <description>redis backup file name which needs to be restored.</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>redis_restore_process</name>
+          <description>port on which redis process runs which needs to be restored. Ex ['device','user','content','dialcode']</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-4812402663506673</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>redis-restore</projectName>
+          <projectFullName>OpsAdministration/dev/DataPipeline/redis-restore</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>false</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>redis-multiprocess</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>pipelines/backup/redis-restore/Jenkinsfile</scriptPath>
+    <lightweight>true</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Bootstrap/config.xml
index 62b910c1e..d42e958fc 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Bootstrap/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Bootstrap/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml
index 234226a02..a18842935 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
   <description></description>
   <keepDependencies>false</keepDependencies>
@@ -7,13 +7,13 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -31,13 +31,13 @@
           <defaultValue>/var/lib/cassandra/data</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-193690420291616</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -45,24 +45,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CassandraBackup</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/CassandraBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-193690422104853</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -71,12 +72,13 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CassandraBackup</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/CassandraBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -92,7 +94,6 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
@@ -102,17 +103,17 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+          <url>https://github.com/badaltechiepi/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>patch-2</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -131,5 +132,5 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
-  <disabled>true</disabled>
+  <disabled>false</disabled>
 </flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml
index aa26d8091..2736bef3f 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml
index d54244fc0..6f995b76a 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
   <description></description>
   <keepDependencies>false</keepDependencies>
@@ -7,25 +7,25 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-193692901127485</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -33,24 +33,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ElasticsearchBackup</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/ElasticsearchBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-193692904321817</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -59,12 +60,13 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ElasticsearchBackup</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/ElasticsearchBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -89,17 +91,17 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+          <url>https://github.com/MasterAlt/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>es-provision</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -119,4 +121,4 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
index 0372d6d3c..2b968ad93 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
   <description></description>
   <keepDependencies>false</keepDependencies>
@@ -7,13 +7,13 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -33,13 +33,13 @@ curl http://localhost:9200/_snapshot/azurebackup/_all, Parse the json and get th
           <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-193693971284924</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -47,24 +47,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ElasticsearchRestore</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/ElasticsearchRestore</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-193693974507874</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -73,12 +74,13 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ElasticsearchRestore</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/ElasticsearchRestore</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -96,12 +98,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+          <url>https://github.com/MasterAlt/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
new file mode 100644
index 000000000..d5825945e
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
@@ -0,0 +1,43 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/harshavardhanc/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>pipelines/deploy/health-check/Jenkinsfile-lp</scriptPath>
+    <lightweight>true</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml
index 70003b8d7..aa56705fb 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitDeploy/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitDeploy/config.xml
index a8e7cfc7c..e1eac1479 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitDeploy/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitDeploy/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitStatus/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitStatus/config.xml
index 9bdcb636d..c9dd56549 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitStatus/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/MonitStatus/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml
index 0648e1023..63f498537 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
   <description></description>
   <keepDependencies>false</keepDependencies>
@@ -7,25 +7,25 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-193695591871973</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -33,24 +33,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4jBackup</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/Neo4jBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-193695594771667</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -59,12 +60,13 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4jBackup</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/Neo4jBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -89,8 +91,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -99,7 +101,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.9.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -119,4 +121,4 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml
index ea9492906..0b3beb196 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
index 7bb0fedf9..9de5c0d6c 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
   <description></description>
   <keepDependencies>false</keepDependencies>
@@ -7,25 +7,25 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-193697432119747</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -33,24 +33,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>RedisBackup</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/RedisBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-193697441891806</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -59,12 +60,13 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>RedisBackup</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/RedisBackup</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -89,17 +91,17 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+          <url>https://github.com/MasterAlt/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>release-2.9.0</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -119,4 +121,4 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisRetore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisRetore/config.xml
new file mode 100644
index 000000000..42f6ca335
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisRetore/config.xml
@@ -0,0 +1,123 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>redis_restore_file_name</name>
+          <description>&lt;font color=teal size=2&gt;give the backup name to be picked to restore&lt;/font&gt;</description>
+          <defaultValue></defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-193693971284924</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RedisRetore</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/RedisRetore</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-193693974507874</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>RedisRetore</projectName>
+          <projectFullName>OpsAdministration/dev/KnowledgePlatform/RedisRetore</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference></reference>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/backup/redis-restore/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/config.xml b/deploy/jenkins/jobs/Provision/config.xml
index 68477b8ac..92618cba9 100644
--- a/deploy/jenkins/jobs/Provision/config.xml
+++ b/deploy/jenkins/jobs/Provision/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.13"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
index 01cae6857..7670b1cf7 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
@@ -1,89 +1,91 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196486141556745</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Cassandra</projectName>
+          <projectFullName>Provision/dev/Core/Cassandra</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196486144020383</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Cassandra</projectName>
+          <projectFullName>Provision/dev/Core/Cassandra</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -101,7 +103,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/CassandraExporter/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/CassandraExporter/config.xml
new file mode 100644
index 000000000..6343c9bd8
--- /dev/null
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/CassandraExporter/config.xml
@@ -0,0 +1,117 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-196486141556745</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraExporter</projectName>
+          <projectFullName>Provision/dev/Core/CassandraExporter</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-196486144020383</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>CassandraExporter</projectName>
+          <projectFullName>Provision/dev/Core/CassandraExporter</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/provision/cassandra/Jenkinsfile.exporter</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml
index 3f3e9b8f3..3245cd533 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Kafka/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Kafka/config.xml
index 9d6f8c1e8..f49831d49 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Kafka/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Kafka/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
index 8b32f3a23..67440d7ee 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -19,73 +18,74 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196487835595646</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Keycloak</projectName>
           <projectFullName>Provision/dev/Core/Keycloak</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196487838166797</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Keycloak</projectName>
           <projectFullName>Provision/dev/Core/Keycloak</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -103,7 +103,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogEsUpgrade6xx/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogEsUpgrade6xx/config.xml
index 02a00d5d4..587e7cebe 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogEsUpgrade6xx/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogEsUpgrade6xx/config.xml
@@ -1,15 +1,14 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -21,75 +20,76 @@
       <parameterDefinitions>
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-186487879604743</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.68">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="db_restore" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.68">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>LogEsUpgrade6xx</projectName>
-          <projectFullName>Provision/loadtest/Core/LogEsUpgrade6xx</projectFullName>
+          <projectFullName>Provision/dev/Core/LogEsUpgrade6xx</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-186487885338467</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.68">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.68">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>LogEsUpgrade6xx</projectName>
-          <projectFullName>Provision/loadtest/Core/LogEsUpgrade6xx</projectFullName>
+          <projectFullName>Provision/dev/Core/LogEsUpgrade6xx</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.78">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/kaali09/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -103,7 +103,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -114,4 +114,4 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml
index 95778c7d7..144b79650 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml
index bf512172c..26c84258d 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml
@@ -1,87 +1,91 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196489635829894</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Postgres</projectName>
+          <projectFullName>Provision/dev/Core/Postgres</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196489639391445</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Postgres</projectName>
+          <projectFullName>Provision/dev/Core/Postgres</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -99,7 +103,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -110,4 +114,4 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml
index 5ca5d99ad..d8a68c1d3 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml
@@ -1,89 +1,91 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196490490920280</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>PostgresDbUpdate</projectName>
+          <projectFullName>Provision/dev/Core/PostgresDbUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196490493760485</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>PostgresDbUpdate</projectName>
+          <projectFullName>Provision/dev/Core/PostgresDbUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -101,7 +103,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdateManaged/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdateManaged/config.xml
index 504dfb72b..64f266536 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdateManaged/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdateManaged/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml
new file mode 100644
index 000000000..258e0b0af
--- /dev/null
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml
@@ -0,0 +1,127 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-196505638775314</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Redis</projectName>
+          <projectFullName>Provision/dev/Core/Redis</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-196505642335779</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Redis</projectName>
+          <projectFullName>Provision/dev/Core/Redis</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/provision/redis/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Registry/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Registry/config.xml
index 7a4cd1955..f8ae5abed 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Registry/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Registry/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml
index 102641d9f..b262ce951 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml
index e335f972d..19e29c899 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml
index 8e96c2c6c..e48455cea 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
index b09d36dca..2b36b0fa3 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -14,25 +14,25 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-196492871381509</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -40,24 +40,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsAPI</projectName>
+          <projectFullName>Provision/dev/DataPipeline/AnalyticsAPI</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-196492874659821</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -66,12 +67,13 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsAPI</projectName>
+          <projectFullName>Provision/dev/DataPipeline/AnalyticsAPI</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -89,8 +91,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
index c20e767a0..e37a1573e 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,86 +7,91 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196493724128621</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsSecor</projectName>
+          <projectFullName>Provision/dev/DataPipeline/AnalyticsSecor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196493728691761</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsSecor</projectName>
+          <projectFullName>Provision/dev/DataPipeline/AnalyticsSecor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -105,7 +109,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -116,4 +120,4 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml
index 3e78f2bae..1d7be9b90 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,73 +25,74 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196494527011530</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsSpark</projectName>
           <projectFullName>Provision/dev/DataPipeline/AnalyticsSpark</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196494532752488</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsSpark</projectName>
           <projectFullName>Provision/dev/DataPipeline/AnalyticsSpark</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -110,7 +110,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Cassandra/config.xml
index 3ddc48990..efabbd98e 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Cassandra/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
index 7d0c034d9..2f1626e38 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -24,18 +23,52 @@
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+          <name>service</name>
+          <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the services to deploy. Multi-selection is available.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-160652271515504</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>return['java',
+'graphite',
+'coordinator',
+'overlord',
+'broker',
+'historical',
+'mm']</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script/>
+              <sandbox>true</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Druid</projectName>
+          <projectFullName>Provision/dev/DataPipeline/Druid</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_MULTI_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -53,7 +86,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/InfluxDB/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/InfluxDB/config.xml
index e0d7d7981..ef82c1136 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/InfluxDB/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/InfluxDB/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kafka/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kafka/config.xml
index fb292a975..27266ac9c 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kafka/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kafka/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,95 +7,98 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196496946659342</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Kafka</projectName>
+          <projectFullName>Provision/dev/DataPipeline/Kafka</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196496948791638</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Kafka</projectName>
+          <projectFullName>Provision/dev/DataPipeline/Kafka</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <hudson.model.StringParameterDefinition>
           <name>remote</name>
-          <description></description>
+          <description/>
           <defaultValue>processing-cluster-kafka</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -114,7 +116,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml
index cac92eae5..84cd1003d 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
index 86592f868..24b356730 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -7,9 +7,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/NodeJs/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/NodeJs/config.xml
index 9fa304888..190be995c 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/NodeJs/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/NodeJs/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Postgres/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Postgres/config.xml
index bfed6405d..0526f34d4 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Postgres/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Postgres/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/RedisCluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/RedisCluster/config.xml
index d65b18541..1b8a272ee 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/RedisCluster/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/RedisCluster/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/TelemetrySearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/TelemetrySearch/config.xml
index d8fa81c34..9f8e179ef 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/TelemetrySearch/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/TelemetrySearch/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
index f1baf8e9d..0f08793d1 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,77 +25,78 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196500122471866</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>true</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
           <projectFullName>Provision/dev/DataPipeline/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196500128714203</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>true</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>true</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
           <projectFullName>Provision/dev/DataPipeline/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -110,7 +110,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Zookeeper/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Zookeeper/config.xml
index 8e02e9159..ed757f538 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Zookeeper/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Zookeeper/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -14,24 +14,24 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
           <randomName>choice-parameter-196500899115571</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -39,24 +39,25 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Zookeeper</projectName>
+          <projectFullName>Provision/dev/DataPipeline/Zookeeper</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
           <description></description>
           <randomName>choice-parameter-196500913815161</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
+            <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -65,12 +66,13 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
+            <secureFallbackScript plugin="script-security@1.66">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Zookeeper</projectName>
+          <projectFullName>Provision/dev/DataPipeline/Zookeeper</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -94,8 +96,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml
index 1a2bcd658..2b9c16fda 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
@@ -25,73 +24,74 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196498570819230</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>postgres-managed</projectName>
           <projectFullName>Provision/dev/DataPipeline/postgres-managed</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196498577913500</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>postgres-managed</projectName>
           <projectFullName>Provision/dev/DataPipeline/postgres-managed</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -109,7 +109,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Cassandra/config.xml
index dbf93f659..51554020d 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Cassandra/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
index a80bfacf8..c311af545 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,74 +25,77 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196502397927441</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CompositeSearch</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/CompositeSearch</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196502408664232</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CompositeSearch</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/CompositeSearch</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -111,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
new file mode 100644
index 000000000..52868463a
--- /dev/null
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -0,0 +1,127 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-196504004472286</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Dial</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/Dial</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-196504007625526</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Dial</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/Dial</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/provision/dial/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
index c13f5f045..c342840a3 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,92 +7,95 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196503227911555</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Kafka</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/Kafka</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196503234123956</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Kafka</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/Kafka</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -111,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
index 9eb3a8c0b..47979810f 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,92 +7,95 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196504004472286</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Learning</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/Learning</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196504007625526</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Learning</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/Learning</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -111,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -122,4 +124,4 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index 5add9187c..2d490d85a 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,92 +7,95 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196504831541165</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196504838020082</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -111,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis/config.xml
index 8bb0df164..65cc73c37 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,15 +7,15 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -26,80 +25,81 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196505638775314</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Redis</projectName>
           <projectFullName>Provision/dev/KnowledgePlatform/Redis</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196505642335779</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Redis</projectName>
           <projectFullName>Provision/dev/KnowledgePlatform/Redis</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -113,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/RedisCluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/RedisCluster/config.xml
index b9b5b38d1..0e8913e0a 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/RedisCluster/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/RedisCluster/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
index 1865d82b1..819d053a5 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index acdf2ac7f..ac1c40a5a 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -14,9 +14,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
index 740a853a8..545feab17 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -8,90 +7,95 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196485017539792</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Zookeeper</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/Zookeeper</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-196485022834542</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.71">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.71">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Zookeeper</projectName>
+          <projectFullName>Provision/dev/KnowledgePlatform/Zookeeper</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -109,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -120,4 +124,4 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/private_repo/ansible/inventory/dev/Core/common.yml b/private_repo/ansible/inventory/dev/Core/common.yml
index 3bcd12823..e07711fcc 100644
--- a/private_repo/ansible/inventory/dev/Core/common.yml
+++ b/private_repo/ansible/inventory/dev/Core/common.yml
@@ -7,60 +7,34 @@ proto:                          # Protocol
 
 # External service ips
 # should be accessible from core containers
-learningservice_ip:                     # Load balancer IP for learning server
-searchservice_ip:                       # search service Load balancer IP
-analyticsapi_ip:                        # Analytics Service Load Balancer IP
-keycloak_url: ""                        # Keycloak Load balancer IP; eg http://10.10.10.10
-sunbird_swarm_manager_lb_ip:             # Swarm manager load balancer private IP. If you don't have a load swarm manager load balancer, you can use swarm manager private ip.
+learningservice_ip:                     # Load balancer IP for learning server or vm ip if its a single vm for learning service
+dialservice_ip:                         # dial service vm ip or Load balancer ip
+keycloak_url: ""                        # Keycloak Load balancer IP; eg http://10.10.10.10 
+# Ip Address of the keycloak without http
+# eg: 11.2.1.10
+keycloak_lb_ip: 
 
 # Sunbird Application name and framework name
 sunbird_default_channel:                # Organization channel name which portal will connect to
 sunbird_app_name:                       # By default app name will be sunbird
 
 # Cloud Account details
-sunbird_content_azure_storage_container: # Conatainer store assets/public
-## Blob where data analytics pushing content
-## Check same variable in DP common.yml
-artifacts_container: ''                 # Azure blob container name to save built artifacts
-
-## Mail config
-mail_server_host:
-mail_server_username: ""
-alerts_mailing_list : ""                # Comma separated mail list for Alerts; eg: user1@mail.com, user2@mail.com
-sunbird_mail_server_from_email:         # Email ID that should be as from address in mails
-sunbird_env_logo_url:                    # put public url for logo, this logo url will be used in email sending.
-
-########################### Release-2.9.0 variables #######################################
-# public storage account with content conatiner.
-sunbird_azure_public_storage_account_name: 
-sunbird_private_storage_account_name:
 
-# Used to store the private contents of the storage account.
-sunbird_azure_private_storage_account_name: 
-
-# used to store backups for or application DB's
-sunbird_azure_management_storage_account_name: 
-
-# This account need to be private to store jenkins build artifacts which will be used commonly between environments.
-sunbird_azure_artifact_storage_account_name: 
-
-# Certs related vars
-certs_badge_name: ""                 # Course Completion Certificate Name e.g value is "Course Completion Certificate"
-certs_badge_description: ""           # Descripton of course Completion e.g value is "Successfully completed course on Sunbird"
-certs_badge_image: ""                # Image of the certs badge e.g value is "sunbird"
-certs_badge_root_org_id: ""          # Root org ID for which the certs will be created e.g value is "0124229474659643111"
-certs_badge_issuer_name: ""          # The issuer of the certs name e.g value is "Government of karnataka"
-certs_badge_issuer_url:  ""          # Issuer organisation official URL e.g value is "https://testdomain.in"
-cert_service_cloud_storage_type: azure  
+sunbird_azure_public_storage_account_name:   # public storage account with content conatiner.
+sunbird_content_azure_storage_container: # where cntent is stored, it has to be created in pubic storage account, its valuse should be same as azure_public_container variable in kp/common.yml
+sunbird_private_storage_account_name:        ## Used to store the private contents of the storage account.
+sunbird_azure_private_storage_account_name:       
+sunbird_azure_management_storage_account_name:   # used to store backups for or application DB's
+sunbird_azure_artifact_storage_account_name:     # This account need to be private to store jenkins build artifacts which will be used commonly between environments.
+artifacts_container: ''                 # Azure blob container name to save built artifacts, default it can be artifacts
 
 #### Content-service ####
 environment_id: # value as to be as Knowledgeplatfom/common.yml environment_id
-graph_passport_key: "{{core_vault_graph_passport_key}}"
-
+graph_passport_key: "{{core_vault_graph_passport_key}}"   
 
 # Kubernetes variables
-namespace: dev
-imagepullsecrets: devregistrysecret
+namespace: "{{ env }}"
+imagepullsecrets: "{{ env }}registrysecret"
 # this willl be prepended to your image
 # for example, if you give
 # dockerhub: sunbird
@@ -74,26 +48,50 @@ sunbird_portal_player_cdn_enabled: false
 # Ip of nginx private ingress
 # Give Ip Address with which the private ingress should be created
 # For safety reason, give ip address from bottom range of cidr
-# for ex: if cidr is 11.2.1.0/24
-private_ingressgateway_ip: 11.2.1.220
+# for ex: if cidr is 11.2.1.0/24   
+private_ingressgateway_ip: 11.2.1.220    
 storage_class_name: ""
-# Ip Address of the keycloak without http
-# eg: 11.2.1.10
-keycloak_lb_ip: 
+private_ingress_custom_annotations: true
+
+default_org_hash_id: ""
+dataexhaust_super_admin_channel: sunbird
 
-# Enable following if you're using kubernetes
- 
-## sunbird_lms_base_url: "http://{{private_ingressgateway_ip}}/api"   ### keycloak env variable
-## sunbird_user_service_base_url: "http://{{private_ingressgateway_ip}}/learner"  #### keycloak env variable
-## __lms_host__: "http://{{private_ingressgateway_ip}}/learner" ### yarn job
-## sunbird_content_service_api_base_url: "http://{{private_ingressgateway_ip}}/content"
-## sunbird_search_service_api_base_url: "http://{{private_ingressgateway_ip}}/search"
-## sunbird_user_service_api_base_url: "http://{{private_ingressgateway_ip}}/learner"
-## kibana_service: kibana.logging.svc.cluster.local:5601
+postgres:
+  db_url: "{{ groups['postgres'][0] }}"
+  db_username: analytics
+  db_name: analytics
+  db_password: "{{core_vault_dp_pgdb_password}}"
+  db_table_name: "{{env}}_consumer_channel_mapping"
+  db_port: 5432
+  db_admin_user: postgres
+  db_admin_password: "{{core_vault_postgres_password}}"
 
 
+sunbird_google_captcha_site_key: 
+google_captcha_private_key: 
 
+# Admin util keys
+adminutil__access_keyprefix: "accessv1_key"
+adminutil__access_keystart: 1
+adminutil__access_keycount: 10
+
+
+######################### Optional ###################
+## Mail config
+mail_server_host:
+mail_server_username: ""
+alerts_mailing_list : ""                # Comma separated mail list for Alerts; eg: user1@mail.com, user2@mail.com
+sunbird_mail_server_from_email:         # Email ID that should be as from address in mails
+sunbird_env_logo_url:                    # put public url for logo, this logo url will be used in email sending.
 
+# Certs related vars
+certs_badge_name: ""                 # Course Completion Certificate Name e.g value is "Course Completion Certificate"
+certs_badge_description: ""           # Descripton of course Completion e.g value is "Successfully completed course on Sunbird"
+certs_badge_image: ""                # Image of the certs badge e.g value is "sunbird"
+certs_badge_root_org_id: ""          # Root org ID for which the certs will be created e.g value is "0124229474659643111"
+certs_badge_issuer_name: ""          # The issuer of the certs name e.g value is "Government of karnataka"
+certs_badge_issuer_url:  ""          # Issuer organisation official URL e.g value is "https://testdomain.in"
+cert_service_cloud_storage_type: azure 
 
 
 
diff --git a/private_repo/ansible/inventory/dev/Core/hosts b/private_repo/ansible/inventory/dev/Core/hosts
index 3fed5ea83..01b8aff5e 100644
--- a/private_repo/ansible/inventory/dev/Core/hosts
+++ b/private_repo/ansible/inventory/dev/Core/hosts
@@ -1,70 +1,20 @@
-# Alert manager nodes which should be clustered
-# This values should be one of any manager node, if you've multinode cluster
-[alert-manager:children]
-# By default this value can be swarm-manager-1 or 2 or n; but for a single 
-# cluster it should be one value.
-# If you have multiple cluster you can list all ips below one by one
-swarm-manager-1
 
-[swarm-manager-1] 
-18.0.0.15 swarm_master=true
-
-# This host will make sure prometheus for all stateful services 
-# will run on a single node, as it has storage dependancy
-# By default this host is same as docker swarm prometheus
-[swarm-agent-for-prometheus-stateful:children]
-swarm-agent-for-prometheus
-
-[swarm-manager:children]
-swarm-manager-1
-
-[swarm-node-1]
-11.3.0.27
-
-[swarm-worker:children]
-swarm-node-1
 
 [keycloak-1]
-18.0.0.9
+18.3.1.6
 
 [keycloak:children]
 keycloak-1
 
 [log-es-2]
-18.0.0.15 es_instance_name=log-es-2 node_name=log-es-2 es_etc_node_master=true es_etc_node_data=true
+18.3.1.6 es_instance_name=log-es-2 node_name=log-es-2 es_etc_node_master=true es_etc_node_data=true
 
 [log-es:children]
 log-es-2
 
-[swarm-agent-for-prometheus-1]
-18.0.0.15
-
-[swarm-agent-for-prometheus:children]
-swarm-agent-for-prometheus-1
-
-[swarm-agent-for-prometheus-stateful:children]
-swarm-agent-for-prometheus
-
-[swarm-dashboard-1]
-18.0.0.15
-
-[swarm-dashboard:children]
-swarm-dashboard-1
-
-[swarm-agent-dashboard-1]
-18.0.0.15
-
-[swarm-agent-dashboard:children]
-swarm-agent-dashboard-1
-
-[alertmanager_stateful:children]
-swarm-agent-dashboard
-
-[swarm-agent-for-alertmanager-1]
-18.0.0.15
 
 [es-1]
-18.0.0.9 es_instance_name=es-1 es_etc_node_master=true es_etc_node_data=true
+18.3.0.4 es_instance_name=es-1 es_etc_node_master=true es_etc_node_data=true
 
 [es-backup:children]
 es-1
@@ -76,19 +26,22 @@ log-es-2
 es-1
 
 [cassandra-1]
-18.0.0.9
+18.3.0.4
 
 [cassandra:children]
 cassandra-1
 
 [postgresql-master-1]
-18.0.0.9
+18.3.0.4
 
 [postgresql-master:children]
 postgresql-master-1
 
 [postgresql-slave-1]
-18.0.0.9
+18.3.0.4
+
+[swarm-manager]
+0.0.0.0    #### keep as it is
 
 [postgresql-slave:children]
 postgresql-slave-1
@@ -98,22 +51,28 @@ postgresql-slave
 postgresql-master
 
 [kafka-1]
-18.0.0.13 kafka_id=1
+18.3.1.5 kafka_id=1
 
 [processing-cluster-kafka]
-18.0.0.13
+18.3.1.5
 
 [kafka:children]
 kafka-1
 
 [processing-cluster-zookeepers]
-18.0.0.50              # Zookeeper IP of processing cluster in Data pipeline
+18.3.1.5            # Zookeeper IP of processing cluster in Data pipeline
+
+[ingestion-cluster-kafka]
+18.3.0.5
 
 [zookeeper:children]
 processing-cluster-zookeepers
 
 [lp-redis]
-18.0.0.51              # Redis master IP of Knowledge platform
+18.3.1.5            # Redis master IP of Knowledge platform
+
+[dp-redis]
+18.3.1.5
 
 [lp-redis-ps:children]
 lp-redis             
@@ -125,43 +84,36 @@ lp-redis-ps
 lp-redis
 
 [learning-neo4j-node1]
-15.0.2.9             # Neo4j ip of Knowledge platform
+18.3.0.4            # Neo4j ip of Knowledge platform
 
 [lp-cassandra]
-18.0.0.9             # cassandra ip of Knowledge platform
+18.3.0.4             # cassandra ip of Knowledge platform
 
 [dp-cassandra]
-18.0.0.9             # cassandra ip of Datapipeline
+18.3.0.4             # cassandra ip of Datapipeline
 
 [local]
-localhost
+localhost ansible_connection=local
 
 [raw-broker]        #Druid Broker IP
 localhost
 
-[swarm-agent-for-alertmanager:children]
-swarm-agent-for-alertmanager-1
-
 [kong-api]
 localhost
 
-[swarm-bootstrap-manager:children]
-swarm-manager
-
-[swarm-nodes:children]
-swarm-manager
-swarm-bootstrap-manager
-swarm-agent-for-prometheus
-swarm-agent-for-alertmanager
+[composite-search-cluster]
+18.3.0.4
 
-[node-exporter:children]
-swarm-manager
+[yarn-master]
+18.3.1.8
 
-[log-forwarder:children]
-swarm-manager
+[yarn-slave]
+18.3.1.8     #yarn master
+18.3.1.9
 
-[composite-search-cluster]
-15.0.2.6
+[yarn:children]
+yarn-master
+yarn-slave
 
 [core:children]
 es
@@ -169,23 +121,21 @@ log-es
 cassandra
 postgresql-master
 postgresql-slave
-swarm-nodes
-swarm-manager
 kafka
 keycloak
-swarm-dashboard
-swarm-agent-dashboard
 composite-search-cluster
+processing-cluster-kafka
+yarn
 
 [env:children]
 core
 local
 
-[log-forwarder:children]
-swarm-manager
-
 [dp-druid-broker]
-11.3.0.3                # Druid broker IP for druid proxy api
+0.0.0.0                # Druid broker IP for druid proxy api
+
+[raw-coordinator]
+0.0.0.0
 
 [all:vars]
 # If you want to tag your prometheus data with unique cluster ids
diff --git a/private_repo/ansible/inventory/dev/Core/secrets.yml b/private_repo/ansible/inventory/dev/Core/secrets.yml
index f9f5043bd..2abf23bba 100644
--- a/private_repo/ansible/inventory/dev/Core/secrets.yml
+++ b/private_repo/ansible/inventory/dev/Core/secrets.yml
@@ -1,17 +1,19 @@
 # !! Might deprecate 
-core_vault_sunbird_ekstep_api_key: 
+core_vault_sunbird_ekstep_api_key: #Take the jwt token api-admin from Jenkins job OnboardConsumers 
 core_vault_sunbird_encryption_key:       #Random hash to encrypt data
-core_vault_kong__test_jwt: 
+core_vault_kong__test_jwt: #Take the jwt token api-admin from Jenkins job OnboardConsumers
 
 ############# Core #######################
 ####### Secrets #######
 
 core_vault_sunbird_trampoline_secret: # some 8 digit password for keycloak sso user
-core_vault_postgres_password: 
+core_vault_postgres_password:       #update same password in dp secrets dp_vault_pgdb_admin_password  variable
+core_vault_dp_pgdb_password:        #update same password in dp secrets dp_vault_pgdb_password  variable       
 core_vault_sunbird_azure_storage_key : 
 core_vault_docker_registry_url: "https://index.docker.io/v1" # use this value if using dockerhub
 core_vault_docker_registry_user:  
 core_vault_docker_registry_password: 
+
 core_vault_proxy_site_key: |+
 
 core_vault_proxy_site_crt: |+
@@ -21,7 +23,7 @@ core_vault_ansible_vault_password:
 ################### DONT FILL THESE VARIABLES INITIALLY ###################
 
 core_vault_sunbird_sso_publickey:  # Get After Keycloak Deployment
-core_vault_sunbird_api_auth_token: #Take the jwt token api-management-test-user from Jenkins job OnboardConsumers and update core_vault_sunbird_api_auth_token if using KP and DP along with core
+core_vault_sunbird_api_auth_token: #Take the jwt token api-admin from Jenkins job OnboardConsumers and update core_vault_sunbird_api_auth_token if using KP and DP along with core
 core_vault_sunbird_keycloak_user_federation_provider_id:      # Get after keycloak deployment
 
 ##### Release-2.3.0 ###################
@@ -32,11 +34,19 @@ core_vault_enc_master_pass: test # encryption password for the keys
 core_vault_graph_passport_key: #copy value from variable lp_vault_graph_passport_key from KnowledgePlatform/Secrets.yml
 
 ##### release-2.7 vars #####
+## How to generate sas token
+# Run the below command in shell
+#
+# date +'%Y-%m-%dT%H:%m:%SZ' -d '+1 year'
+# sas_token=?`az storage account generate-sas --account-name "{{ azure_plugin_storage_account_name }}" --account-key "{{ azure_plugin_storage_account_key }}" --expiry $sas_expire_time --https-only --permissions acdlpruw --resource-types sco --services bfqt | xargs`
+#
+##
+ # generate a sas for the blob for entire storage accout with write and read access
 artifact_azure_account_sas: # generate a sas for the blob for entire storage accout with write and read access.
-
-############################
+sunbird_public_storage_account_sas:
 # public storage account with content conatiner.
 sunbird_azure_public_storage_account_key:
+sunbird_public_storage_account_key:
 
 # Used to store the private contents of the storage account.
 sunbird_azure_private_storage_account_key:
@@ -50,8 +60,7 @@ sunbird_azure_artifact_storage_account_key:
 
 ### release-2.8.0 #####
 core_vault_sunbird_sso_client_secret: #get the lms client secret from keycloak
-
-
+adminutil_refresh_token_public_key_kid: ""   #get after eycloak deployment using lms client
 
 
 
diff --git a/private_repo/ansible/inventory/dev/DataPipeline/common.yml b/private_repo/ansible/inventory/dev/DataPipeline/common.yml
index 8d45b41bd..49c7fbc62 100644
--- a/private_repo/ansible/inventory/dev/DataPipeline/common.yml
+++ b/private_repo/ansible/inventory/dev/DataPipeline/common.yml
@@ -10,9 +10,10 @@ bootstrap_key_path:
 secor_azure_container_name: ""
 secor_alerts_slack_channel: ""
 
-#dp_azure_account_name:  # azure storage account name
 sunbird_private_storage_account_name: # Azure account name for analytics api contents
 sunbird_artifact_storage_account_name: # Azure stroage account name used for artifact upload
+sunbird_public_storage_account_name:
+
 default_org_hash_id: "" # channel id of the organization
 
 # Data products monitoring web hooks
@@ -42,6 +43,30 @@ ingestion_kafka_topics:
     replication_factor: 1
 # Geo location related var
 maxmind_db_license_key:
-swarm_manager_lb_ip:    # Update the swarm lb ip if you dont have lb then update the swarm server ip
-#report_azure_account_name:  # Update the azure account name
-#report_azure_storage_secret: "{{ dp_vault_reports_azure_key }}"
+
+postgres:
+  db_url: "{{ groups['postgres'][0] }}"
+  db_username: analytics
+  db_name: analytics
+  db_password: "{{dp_vault_pgdb_password}}"
+  db_table_name: "{{env}}_consumer_channel_mapping"
+  db_port: 5432
+  db_admin_user: postgres
+  db_admin_password: "{{dp_vault_pgdb_admin_password}}"
+  
+sunbird_private_azure_report_container_name: 'reports'
+sunbird_public_azure_report_container_name: 'public-reports'
+sunbird_druid_storage_account_name: 
+
+dialservice_ip:    ### dial vm ip
+dialcode_host: "http://{{dialservice_ip}}:9001"
+dialcode_endpoint: "dialcode/v3/read/"
+
+# docker hub details
+dockerhub: 
+docker_registry:    ## user
+imagepullsecrets: {{env}}-registry-secret
+
+kubeconfig_path: /var/lib/jenkins/secrets/k8s.yaml
+private_ingressgateway_ip: 
+
diff --git a/private_repo/ansible/inventory/dev/DataPipeline/hosts b/private_repo/ansible/inventory/dev/DataPipeline/hosts
index ab44b9f41..3d26ac9a8 100644
--- a/private_repo/ansible/inventory/dev/DataPipeline/hosts
+++ b/private_repo/ansible/inventory/dev/DataPipeline/hosts
@@ -1,56 +1,52 @@
 ################ Core #########################
-[swarm-bootstrap-manager]
-15.0.1.4
 
 [core-cassandra]
-15.0.0.7
+18.3.0.4
 
 [core-es-1]
-15.0.0.50    # This should be elasticsearch master IP of Core
+18.3.0.4   # This should be elasticsearch master IP of Core
 
 [core-es:children]
 core-es-1
 
 [log-es-1]
-15.0.0.1
+18.3.16
 
 [log-es:children]
 log-es-1
 
 ################# LP ##########################
-[search]
-15.0.3.5
 
 [learning]
-15.0.3.11
+18.3.1.5
 
 [composite-search-cluster]
-15.0.2.6
+18.3.0.4
 
 [lp-cassandra]
-15.0.2.7
+18.3.0.4
 
 [dp-cassandra]
-15.0.2.7
+18.3.0.4
 
 [lp-redis]
-15.0.3.11
+18.3.1.5
 
 ################# LPA #########################
 [analytics-api]
-15.0.3.6
+18.3.1.7
 
 [secor]
-15.0.3.15
+18.3.1.7
 
 [spark]
-15.0.3.12
+18.3.1.7
 
 [cassandra]
-15.0.2.7
+18.3.0.4
 
 [postgres]
-15.0.3.17
+18.3.0.4
 
 [lpa:children]
 spark
@@ -60,49 +56,73 @@ cassandra
 ########################### DP #############################
 
 [kafka-indexer]
-15.0.3.8
+18.3.1.7
 
 [influxdb]
-15.0.3.6
+18.3.0.4
 
 [redis]
-15.0.3.5
+18.3.1.5
 
 [redisall:children]
 redis
 
 [processing-cluster-kafka]
-15.0.3.8
-15.0.3.7
+18.3.1.5
 
 [processing-cluster-zookeepers]
-15.0.3.8
-15.0.3.7
+18.3.1.5
 
-[telemetry-search-cluster1]
-15.0.2.6
-
-[telemetry-search-cluster:children]
-telemetry-search-cluster1
 
 [zookeeper:children]
 processing-cluster-zookeepers
 
-[telemetry-search-cluster-kibana-node:children]
-telemetry-search-cluster1
-
 [yarn-master]
-15.0.3.10
+18.3.1.8
 
 [yarn-slave]
-15.0.3.13
+18.3.1.9
 
 [yarn:children]
 yarn-master
 yarn-slave
 
 [local]
-localhost
+localhost ansible_connection=local
+
+[druid-postgres]
+18.3.1.10
+
+[raw-coordinator]
+18.3.1.10
+
+[raw-overlord]
+18.3.1.10
+
+[raw-broker]
+18.3.1.10
+
+[raw-historical]
+18.3.1.10
+
+[raw-middlemanager]
+18.3.1.10
+
+[raw-graphite]
+18.3.1.10
+
+[raw-zookeeper]
+18.3.1.10
+
+
+[druid-raw:children]
+raw-coordinator
+raw-overlord
+raw-broker
+raw-historical
+raw-middlemanager
+raw-graphite
+raw-zookeeper
 
 [broker]
 0.0.0.0 #### its required for data products deploy
@@ -110,21 +130,23 @@ localhost
 [coordinator]
 0.0.0.0 #### its required for analytics deploy
 
+[telemetry-search-cluster-kibana-node]
+0.0.0.0
+
 [dp:children]
 local
 processing-cluster-kafka
 processing-cluster-zookeepers
 zookeeper
 postgres
-telemetry-search-cluster
-telemetry-search-cluster-kibana-node
 yarn
 kafka-indexer
 influxdb
 lpa
+druid-raw
+druid-postgres
 
 [env:children]
-swarm-bootstrap-manager
 dp
 
 [env:vars]
@@ -132,34 +154,6 @@ ansible_ssh_user=deployer
 ansible_ssh_private_key_file=/var/lib/jenkins/secrets/deployer_ssh_key
 
 
-########################### Monitoring ##########################
-[yarn-ps]
-15.0.3.10
-15.0.3.13
-
-[logstash-ps]
-15.0.3.8
-
-[es-ps]
-15.0.2.6
-
-[process-exporter:children]
-yarn-ps
-logstash-ps
-es-ps
-secor-ps
-analytics-ps
-kafka-ps
-
-[secor-ps]
-15.0.3.15
-
-[analytics-ps]
-15.0.3.6
-
-[kafka-ps]
-15.0.3.8
-15.0.3.7
 
 [all:vars]
 ansible_ssh_user=deployer
diff --git a/private_repo/ansible/inventory/dev/DataPipeline/secrets.yml b/private_repo/ansible/inventory/dev/DataPipeline/secrets.yml
index 4df9e341f..43e42ed4c 100644
--- a/private_repo/ansible/inventory/dev/DataPipeline/secrets.yml
+++ b/private_repo/ansible/inventory/dev/DataPipeline/secrets.yml
@@ -1,15 +1,24 @@
-############## Admin ######################
-
 ############## DP ######################
-dp_vault_artifacts_container: 
+dp_vault_artifacts_container: artifacts
 dp_search_service_authorization_token: 
 dp_vault_pgdb_password: 
 dp_vault_pgdb_admin_password:
-dp_vault_data_exhaust_token: 
-
+dp_vault_druid_postgress_pass:
+dp_vault_data_exhaust_token:
+dp_play_http_secret_key: ""    ###random text 
 
 # Storage Account credentials for Knowledge Platform
 sunbird_management_storage_account_key:
-sunbird_artifact_storage_account_key:
-sunbird_artifact_storage_account_sas:
-sunbird_private_storage_account_key:
+sunbird_artifact_storage_account_key: 
+sunbird_artifact_storage_account_sas: 
+sunbird_private_storage_account_key: 
+sunbird_public_storage_account_key: 
+sunbird_druid_storage_account_key: 
+
+core_vault_docker_registry_url: 
+core_vault_docker_registry_user:
+core_vault_docker_registry_password: 
+
+dp_vault_dialcode_api_auth_key:     ### copy value form cariable core_vault_sunbird_api_auth_token from core/secrets.yml
+sunbird_api_auth_token:             ### ### copy value form cariable core_vault_sunbird_api_auth_token from core/secrets.yml
+core_vault_sunbird_encryption_key:   ## copy from core secrets.yml
diff --git a/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml b/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml
index 7ad3131de..294d5efc1 100644
--- a/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml
+++ b/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml
@@ -30,20 +30,29 @@ sunbird_artifact_storage_account_name:
 
 ##########################################################
 
-swarm_manager_lb_ip:       # Enter the LB IP in case you are using a swarm manager load balancer OR Swarm manager's IP if not using a load balancer
-
 # Enable following if you're using kubernetes
 
 # Ip of nginx private ingress
 # Give Ip Address with which the private ingress should be created
 # For safety reason, give ip address from bottom range of cidr
 # for ex: if cidr is 11.2.1.0/24
-## private_ingressgateway_ip: 11.2.1.220
+private_ingressgateway_ip: 11.2.1.220
 #
-## learner_service_base_url: "http://{{private_ingressgateway_ip}}/learner"  ## lp samza jobs
-## cert_service_base_url: "http://{{private_ingressgateway_ip}}/cert"    ### lp samza jobs
-## kp_content_service_base_url: "http://{{private_ingressgateway_ip}}/content"
-## cert_reg_service_base_url: "http://{{private_ingressgateway_ip}}/certreg"
-## kp_search_service_base_url: "http://{{private_ingressgateway_ip}}/search"
-## kp_print_service_base_url: "http://{{private_ingressgateway_ip}}/print"
-## lms_service_base_url: "http://{{private_ingressgateway_ip}}/lms"
+learner_service_base_url: "http://{{private_ingressgateway_ip}}/learner"  ## lp samza jobs
+cert_service_base_url: "http://{{private_ingressgateway_ip}}/cert"    ### lp samza jobs
+kp_content_service_base_url: "http://{{private_ingressgateway_ip}}/content"
+cert_reg_service_base_url: "http://{{private_ingressgateway_ip}}/certreg"
+kp_search_service_base_url: "http://{{private_ingressgateway_ip}}/search"
+kp_print_service_base_url: "http://{{private_ingressgateway_ip}}/print"
+lms_service_base_url: "http://{{private_ingressgateway_ip}}/lms"
+
+
+kubeconfig_path: /var/lib/jenkins/secrets/k8s.yaml
+dockerhub: 
+docker_registry:      #### docker hub user
+sunbird_private_storage_account_name: 
+
+learningservice_ip:    ### learning vm or load balancer ip
+dialservice_ip:        ## dial service vm or loadbalancer ip
+dial_service_search_url: "http://{{dialservice_ip}}:9001/dialcode/v3/search"
+dial_service_generate_url: "http://{{dialservice_ip}}:9001/dialcode/v3/generate"
diff --git a/private_repo/ansible/inventory/dev/KnowledgePlatform/hosts b/private_repo/ansible/inventory/dev/KnowledgePlatform/hosts
index 0fc235f90..b1c6a8e94 100644
--- a/private_repo/ansible/inventory/dev/KnowledgePlatform/hosts
+++ b/private_repo/ansible/inventory/dev/KnowledgePlatform/hosts
@@ -1,28 +1,31 @@
 ######################## LP ########################
 
 [learning1]
-15.0.3.11
-
-[swarm-bootstrap-manager]
-15.0.1.4
+18.3.1.5
 
 [learningall:children]
 learning1
 
-[search1]
-15.0.3.5
-
-[searchall:children]
-search1
-
 [redis1]
-15.0.3.11
+18.3.1.5
 
 [redisall:children]
 redis1
 
+[dial1]
+18.3.1.5
+
+[dial:children]
+dial1
+
+[dp-redis]
+18.3.1.5
+
+[lms-redis]
+18.3.1.5
+
 [learning-neo4j-node1]
-15.0.2.9
+18.3.0.4
 
 # Enable following host, if you're have neo4j cluster and an arbiter for election
 # [arbiter]
@@ -32,42 +35,42 @@ redis1
 learning-neo4j-node1
 
 [cassandra-node-1]   # The old cassandra group has been renamed to cassandra-node-* to accomadate for clusters
-15.0.2.7
+18.3.0.4
 
 [cassandra:children]
 cassandra-node-1
 
 [dp-cassandra]
-15.0.2.7
+18.3.0.4
 
 [core-cassandra]
-15.0.2.5
+18.3.0.4
 
 [core-es-1]
-18.0.0.9    # This should be elasticsearch master IP of Core
+18.3.0.4    # This should be elasticsearch master IP of Core
 
 [core-es:children]
 core-es-1
 
 [composite-search-cluster]
-15.0.2.6
+18.3.0.4
 
 [yarn-master]
-15.0.3.10
+18.3.1.8
 
 [yarn-slave]
-15.0.3.10     #yarn master
-15.0.3.13
+18.3.1.8     #yarn master
+18.3.1.9
 
 [yarn:children]
 yarn-master
 yarn-slave
 
 [processing-cluster-kafka]
-15.0.3.14
+18.3.1.5
 
 [processing-cluster-zookeepers]
-15.0.3.14
+18.3.1.5
 
 [zookeeper:children]
 processing-cluster-zookeepers
@@ -77,7 +80,6 @@ localhost ansible_connection=local
 
 [lp:children]
 learningall
-searchall
 learning-neo4j-cluster
 cassandra
 redisall
@@ -89,22 +91,28 @@ local
 
 [env:children]
 lp
-swarm-bootstrap-manager
 
 [env:vars]
 ansible_ssh_user=deployer
 ansible_ssh_private_key_file=/var/lib/jenkins/secrets/deployer_ssh_key
 
+[es7]
+0.0.0.0
+
+[mlworkbench]
+0.0.0.0
+
+
 ####################### Monitoring ########################
 [logstash-ps]
-15.0.3.11
+18.3.1.5
 
 [process-exporter:children]
 logstash-ps
 cassandra-ps
 
 [cassandra-ps]
-15.0.2.7
+18.3.0.4
 
 [process-exporter:vars]
 ansible_ssh_user=deployer
diff --git a/private_repo/ansible/inventory/dev/KnowledgePlatform/secrets.yml b/private_repo/ansible/inventory/dev/KnowledgePlatform/secrets.yml
index b92f6640b..ea2dcac91 100644
--- a/private_repo/ansible/inventory/dev/KnowledgePlatform/secrets.yml
+++ b/private_repo/ansible/inventory/dev/KnowledgePlatform/secrets.yml
@@ -5,7 +5,12 @@ lp_vault_youtube_api_key:
 lp_vault_dial_service_authorization: 
 
 # Storage Account credentials for Knowledge Platform
+sunbird_private_storage_account_key:
 sunbird_public_storage_account_key:
 sunbird_management_storage_account_key:
 sunbird_artifact_storage_account_key:
 sunbird_artifact_storage_account_sas:
+
+core_vault_docker_registry_url: 
+core_vault_docker_registry_user: 
+core_vault_docker_registry_password: 
diff --git a/private_repo/ansible/inventory/dev/Kubernetes/common.yml b/private_repo/ansible/inventory/dev/Kubernetes/common.yml
new file mode 120000
index 000000000..1465b4667
--- /dev/null
+++ b/private_repo/ansible/inventory/dev/Kubernetes/common.yml
@@ -0,0 +1 @@
+../Core/common.yml
\ No newline at end of file
diff --git a/private_repo/ansible/inventory/dev/Kubernetes/hosts b/private_repo/ansible/inventory/dev/Kubernetes/hosts
new file mode 120000
index 000000000..fb74d690d
--- /dev/null
+++ b/private_repo/ansible/inventory/dev/Kubernetes/hosts
@@ -0,0 +1 @@
+../Core/hosts
\ No newline at end of file
diff --git a/private_repo/ansible/inventory/dev/Kubernetes/secrets.yml b/private_repo/ansible/inventory/dev/Kubernetes/secrets.yml
new file mode 120000
index 000000000..6bbc077aa
--- /dev/null
+++ b/private_repo/ansible/inventory/dev/Kubernetes/secrets.yml
@@ -0,0 +1 @@
+../Core/secrets.yml
\ No newline at end of file

From ef494cd3e4d41c8d32f7e481752965984dce326a Mon Sep 17 00:00:00 2001
From: VenkatKadiveti <60449077+VenkatKadiveti@users.noreply.github.com>
Date: Thu, 17 Dec 2020 11:49:10 +0530
Subject: [PATCH 078/184] Release 3.6.0 discussion middleware envs (#2093)

* Issue sh-21326 fix: discussion forum envs

* Issue sh-21326 fix: discussion middleware envs
---
 .../templates/sunbird_discussions-mw-service.env         | 9 ++++++++-
 ansible/roles/stack-sunbird/templates/sunbird_player.env | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
index 9deda226a..82c161d38 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
@@ -1 +1,8 @@
-discussion_forum_token= {{ discussion_forum_token }}
\ No newline at end of file
+nodebb_service_url={{ discussionsmw_nodebb_service_url | default('http://nodebb-service:4567') }}
+
+# Steps to generating the Nodebb auth token
+# 1. Login to Nodebb site as a Admin.
+# 2. go to admin panel.
+# 3. click on Plugins => Write API
+# 4. enter UID as 1 and click create token (Auth token).
+authorization_token={{ discussionsmw_nodebb_authorization_token }}
\ No newline at end of file
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index 43a9d0cb9..5a207da4e 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -113,3 +113,4 @@ reportsListVersion={{reportsListVersion|default('v1')}}
 
 #Release-3.2.7
 sunbird_data_product_service=http://kong:8000/
+discussions_middleware={{ discussionsmw_service_url | default('http://discussionsmw-service:3002') }}
\ No newline at end of file

From 80d11ed6158172dbac6895050b6124aaee89fa8b Mon Sep 17 00:00:00 2001
From: RevathiKotla <45757421+RevathiKotla@users.noreply.github.com>
Date: Thu, 17 Dec 2020 13:14:29 +0530
Subject: [PATCH 079/184] TG-663: Add new exporter to montoring stack (#2096)

* TG-663: Add job to monitoring stack
---
 kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
index 942d95e64..0b96e7c68 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
@@ -12,6 +12,7 @@ monitoring_stack:
   - kafka-topic-exporter
   - prometheus-redis-exporter
   - processing-kafka-exporter
+  - azure-ambari-prometheus-exporter
 
 namespace: monitoring
 

From 5c800fba07ca162181ef09504e393ef26bf458c0 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Thu, 17 Dec 2020 09:55:29 +0000
Subject: [PATCH 080/184] Adding nodebb url (#2097)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../templates/sunbird_discussions-mw-service.env              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
index 82c161d38..f675e3832 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
@@ -1,8 +1,8 @@
 nodebb_service_url={{ discussionsmw_nodebb_service_url | default('http://nodebb-service:4567') }}
 
 # Steps to generating the Nodebb auth token
-# 1. Login to Nodebb site as a Admin.
+# 1. Login to Nodebb (https://<domain-name>/discussions/login) as a Admin.
 # 2. go to admin panel.
 # 3. click on Plugins => Write API
 # 4. enter UID as 1 and click create token (Auth token).
-authorization_token={{ discussionsmw_nodebb_authorization_token }}
\ No newline at end of file
+authorization_token={{ discussionsmw_nodebb_authorization_token }}

From 7eb99d1fbcf22ffc496bd7a9c75f69b6031f5f21 Mon Sep 17 00:00:00 2001
From: kaliraja <34502260+Kaali09@users.noreply.github.com>
Date: Thu, 17 Dec 2020 16:35:46 +0530
Subject: [PATCH 081/184] Issue: #0000: updated the redis process alert rule.
 (#2098)

---
 .../monitoring/alertrules/templates/promrulesProcess.yml         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml
index dcf9b8aab..27a438f7b 100644
--- a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml
+++ b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesProcess.yml
@@ -207,6 +207,7 @@ spec:
         job_id: Redis
         alertname: RedisProcessNotRunning
     {{- end }}
+    {{- end }}
 
     - alert: redisserver_process_not_running_fatal
       expr: sum without(state) (namedprocess_namegroup_states{groupname="redis-server"}) == 0

From ae18860d36e81c04e18bcbd11efb79ad97db80d6 Mon Sep 17 00:00:00 2001
From: VenkatKadiveti <60449077+VenkatKadiveti@users.noreply.github.com>
Date: Thu, 17 Dec 2020 16:41:02 +0530
Subject: [PATCH 082/184] Issue fix: adding discussions forum middleware apis
 in kong (#2062)

* Issue fix: adding discussions forum middleware apis in kong

* Issue fix: changing the url prefix

* Issue #SB-21326 fix: adding discussions forum middleware apis in kong

* issue #SH-21326 fix: adding discussions forum apis in kong

* issue #SH-21326 fix: adding discussions forum apis in kong

* issue #SH-21326 fix: adding discussions forum apis in kong

* issue #SH-21326 fix: adding discussions forum apis in kong

* issue #SH-21326 fix: adding discussions forum apis in kong

* Issue sh-21326 fix: Discussion middleware apis

* Issue sh-21326 fix: discussion forum middleware apis

* Issue sh-21326 fix: discussion forum envs

* Issue sh-21326 fix: discussion forum apis

* Issue sh-21326 fix: discussion forum apis

* Issue sh-21326 fix: discussion forum apis
---
 ansible/roles/kong-api/defaults/main.yml | 416 +++++++++++++++++++++++
 1 file changed, 416 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index c7ff75e75..f98c22590 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -76,6 +76,7 @@ object_category_definition_prefix: /object/category/definition
 dataset_service_prefix: /dataset
 asset_prefix: /asset
 collection_prefix: /collection
+discussions_prefix: /discussion
 question_prefix: /question
 questionset_prefix: /questionset
 
@@ -97,6 +98,7 @@ report_service_url: "http://report-service:3030"
 group_service_url: "http://groups-service:9000"
 analytics_api_service_url: "http://analytics-service:9000"
 taxonomy_service_url: "http://taxonomy-service:9000"
+discussions_mw_service_url: "http://discussionsmw-service:3002/discussion"
 assessment_service_url: "http://assessment-service:9000"
 
 premium_consumer_rate_limits:
@@ -5696,6 +5698,420 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
+  - name: getDiscussionTagsList
+    uris: "{{ discussions_prefix }}/tags"
+    upstream_url: "{{ discussions_mw_service_url }}/tags"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"      
+
+  - name: getDiscussionCategories
+    uris: "{{ discussions_prefix }}/categories"
+    upstream_url: "{{ discussions_mw_service_url }}/categories"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getDiscussionNotificationsList
+    uris: "{{ discussions_prefix }}/notifications"
+    upstream_url: "{{ discussions_mw_service_url }}/notifications"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getUserDetailsOfDiscussion
+    uris: "{{ discussions_prefix }}/user"
+    upstream_url: "{{ discussions_mw_service_url }}/user"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getCategoryDetailsOfDiscussion
+    uris: "{{ discussions_prefix }}/category"
+    upstream_url: "{{ discussions_mw_service_url }}/category"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getUnreadTopicsOfDiscussion
+    uris: "{{ discussions_prefix }}/unread"
+    upstream_url: "{{ discussions_mw_service_url }}/unread"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getRecentTopicsOfDiscussion
+    uris: "{{ discussions_prefix }}/recent"
+    upstream_url: "{{ discussions_mw_service_url }}/recent"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getPopularTopicsOfDiscussion
+    uris: "{{ discussions_prefix }}/popular"
+    upstream_url: "{{ discussions_mw_service_url }}/popular"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getTopTopicsOfDiscussion
+    uris: "{{ discussions_prefix }}/top"
+    upstream_url: "{{ discussions_mw_service_url }}/top"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getTopicsOfDiscussionById
+    uris: "{{ discussions_prefix }}/topic"
+    upstream_url: "{{ discussions_mw_service_url }}/topic"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getTotalUnreadTopicsOfDiscussion
+    uris: "{{ discussions_prefix }}/unread/total"
+    upstream_url: "{{ discussions_mw_service_url }}/unread/total"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getTopicsOfDiscussionByTeaserId
+    uris: "{{ discussions_prefix }}/topic/teaser"
+    upstream_url: "{{ discussions_mw_service_url }}/topic/teaser"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getTopicsPaginationByIdOfDiscussion
+    uris: "{{ discussions_prefix }}/topic/pagination"
+    upstream_url: "{{ discussions_mw_service_url }}/topic/pagination"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getGroupsListOfDiscussion
+    uris: "{{ discussions_prefix }}/groups"
+    upstream_url: "{{ discussions_mw_service_url }}/groups"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getRecentPostsByDateOfDiscussions
+    uris: "{{ discussions_prefix }}/recent/posts"
+    upstream_url: "{{ discussions_mw_service_url }}/recent/posts"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: createTopicOfDiscussions
+    uris: "{{ discussions_prefix }}/v2/topics"
+    upstream_url: "{{ discussions_mw_service_url }}/v2/topics"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: createCategoryOfDiscussion
+    uris: "{{ discussions_prefix }}/v2/categories"
+    upstream_url: "{{ discussions_mw_service_url }}/v2/categories"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: createGroupsOfDiscussion
+    uris: "{{ discussions_prefix }}/v2/groups"
+    upstream_url: "{{ discussions_mw_service_url }}/v2/groups"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: createNewPostOfDiscussion
+    uris: "{{ discussions_prefix }}/v2/posts"
+    upstream_url: "{{ discussions_mw_service_url }}/v2/posts"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: createNewUserOfDiscussion
+    uris: "{{ discussions_prefix }}/v2/users"
+    upstream_url: "{{ discussions_mw_service_url }}/v2/users"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getUserDetailsOfDiscussion
+    uris: "{{ discussions_prefix }}/user/username"
+    upstream_url: "{{ discussions_mw_service_url }}/user/username"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: getForumIdOfDiscussion
+    uris: "{{ discussions_prefix }}/forumId"
+    upstream_url: "{{ discussions_mw_service_url }}/forumId"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionAccess'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: addForumOfDiscussion
+    uris: "{{ discussions_prefix }}/forum"
+    upstream_url: "{{ discussions_mw_service_url }}/forum"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'discussionCreate'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
   - name: questionCreate
     uris: "{{ question_prefix }}/v1/create"
     upstream_url: "{{ assessment_service_url }}/question/v4/create"

From 8cc3b5560b50125d2c58f0b50106617f102b70e4 Mon Sep 17 00:00:00 2001
From: kaliraja <34502260+Kaali09@users.noreply.github.com>
Date: Thu, 17 Dec 2020 17:19:20 +0530
Subject: [PATCH 083/184] Exporter fix (#2099)

* Issue: #0000: updated the alertrules  manifests

* Issue: #0000: updated the vars

* Issue: #0000: added the spark cluster var
---
 .../ansible/roles/sunbird-monitoring/defaults/main.yml       | 4 ++++
 .../templates/azure-ambari-prometheus-exporter.yaml          | 4 ++--
 .../templates/alerRules.yaml                                 | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
index 0b96e7c68..2dbf48b50 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
@@ -211,3 +211,7 @@ druid_raw_ingestion_lag_threshold: 200000
 druid_rollup_ingestion_lag_threshold: 200000
 rollup_druid_datasource: ""
 redis_process_names: ""
+
+vault_azure_spark_cluster_http_password: ""
+azure_spark_cluster_http_password: {{ vault_azure_spark_cluster_http_password }}
+
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/azure-ambari-prometheus-exporter.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/azure-ambari-prometheus-exporter.yaml
index a6ee4ed5b..5923bb5a0 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/azure-ambari-prometheus-exporter.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/azure-ambari-prometheus-exporter.yaml
@@ -5,9 +5,9 @@ env:
     # metrics_url - get metrics for all metrics for hdinsight cluster for each component
     metrics_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/clusters/{{env}}-spark-cluster/host_components?fields=metrics/*"
     # alert_url - get alert count for the cluster (critical,ok etc)
-    alert_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/clusters/{{env}}-spark-cluster/alerts?format=summary
+    alert_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/clusters/{{env}}-spark-cluster/alerts?format=summary"
     # cluster_app_history_url - get the history of applications that run so far in cluster
-    app_history_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/applications
+    app_history_url: "http://{{env}}-spark-cluster.azurehdinsight.net/api/v1/applications"
     # user name for azure hdcluster
     user: admin
     # password for azure hdcluster
diff --git a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/alerRules.yaml b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/alerRules.yaml
index afd846b99..8a6be2921 100644
--- a/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/alerRules.yaml
+++ b/kubernetes/helm_charts/monitoring/azure-ambari-prometheus-exporter/templates/alerRules.yaml
@@ -3,8 +3,9 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   labels:
-    {{- include "azure-ambari-prometheus-exporter.labels" . | nindent 4 }}
-    {{- toYaml .Values.serviceMonitor.labels | nindent 4 }}
+    role: alert-rules
+    app: {{ .Values.serviceMonitorLabels.release }}
+    release: {{ .Values.serviceMonitorLabels.release }}
   name: {{ include "azure-ambari-prometheus-exporter.fullname" . }}-alertrule
   namespace: {{ default .Values.namespace .Release.Namespace  }}
 spec:

From dc4310c1ed297293a0dd0b0521a0b2926fbe3f4f Mon Sep 17 00:00:00 2001
From: kaliraja <34502260+Kaali09@users.noreply.github.com>
Date: Mon, 21 Dec 2020 11:25:27 +0530
Subject: [PATCH 084/184] Issue: #0000: corrected the syntax error.

---
 kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
index 2dbf48b50..211cf8802 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
@@ -213,5 +213,5 @@ rollup_druid_datasource: ""
 redis_process_names: ""
 
 vault_azure_spark_cluster_http_password: ""
-azure_spark_cluster_http_password: {{ vault_azure_spark_cluster_http_password }}
+azure_spark_cluster_http_password: "{{ vault_azure_spark_cluster_http_password }}"
 

From c0561c61d6f5317192e939a94e2e08978b4dbffd Mon Sep 17 00:00:00 2001
From: kaliraja <34502260+Kaali09@users.noreply.github.com>
Date: Mon, 21 Dec 2020 11:25:37 +0530
Subject: [PATCH 085/184] Issue: #0000: corrected the syntax error.


From b2e943e4aa72d149592b25f0b9e6baa5f7559608 Mon Sep 17 00:00:00 2001
From: Mahesh Kumar Gangula <maheshkumargangula@users.noreply.github.com>
Date: Mon, 21 Dec 2020 13:30:31 +0530
Subject: [PATCH 086/184] KP Flink job metrics - retired collection skip events
 count (#2104)

* Issue #000 fix: kp flink job metrics - retired collection skip events count.

* Issue #000 fix: kp flink job metrics - retired collection skip events count.

* Issue: #0000: corrected the syntax error.

* Issue: #0000: corrected the syntax error.

* Issue #000 fix: kp flink job metrics - retired collection skip events count.

Co-authored-by: kaliraja <34502260+Kaali09@users.noreply.github.com>
Co-authored-by: G33tha <geethap240@gmail.com>
---
 .../kp-flink-jobs-metrics-dashboard.json      | 107 ++++++++++++++++--
 1 file changed, 100 insertions(+), 7 deletions(-)

diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/kp-flink-jobs-metrics-dashboard.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/kp-flink-jobs-metrics-dashboard.json
index 9ccb60dc4..07f9c6e54 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/dashboards/kp-flink-jobs-metrics-dashboard.json
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/kp-flink-jobs-metrics-dashboard.json
@@ -15,7 +15,6 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 109,
   "links": [],
   "panels": [
     {
@@ -340,7 +339,7 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 8,
+        "w": 6,
         "x": 0,
         "y": 5
       },
@@ -434,8 +433,8 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 8,
-        "x": 8,
+        "w": 6,
+        "x": 6,
         "y": 5
       },
       "id": 62,
@@ -528,8 +527,8 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 8,
-        "x": 16,
+        "w": 6,
+        "x": 12,
         "y": 5
       },
       "id": 63,
@@ -596,6 +595,100 @@
       ],
       "valueName": "current"
     },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#F2495C",
+        "rgba(237, 129, 40, 0.89)",
+        "#299c46"
+      ],
+      "datasource": "Flink-Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 18,
+        "y": 5
+      },
+      "id": 72,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "$$hashKey": "object:1401",
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "$$hashKey": "object:1402",
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_activity_aggregate_updater_retired_consumption_events_count[$__range]))",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Retired Collection Skip Count",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "$$hashKey": "object:1404",
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
     {
       "cacheTimeout": null,
       "colorBackground": false,
@@ -1926,5 +2019,5 @@
   "timezone": "",
   "title": "KP Flink Jobs Metrics",
   "uid": "YngLt0kG1",
-  "version": 21
+  "version": 1
 }
\ No newline at end of file

From 45b11d5a1bb391c061705d749260735af37b7f67 Mon Sep 17 00:00:00 2001
From: Rajeev Sathish <rajeev.sathish@tarento.com>
Date: Mon, 28 Dec 2020 15:40:54 +0530
Subject: [PATCH 087/184] Release 3.5.0 (#2108)

* Issue #SB-21908 language changes

* Issue #SB-21856 changes for telemetry

* Issue #SB-0000 adding the crypto key

* Issue #SB-0000 adding the crypto key
---
 ansible/artifacts/sunbird/login/resources/js/login.js    | 2 +-
 ansible/roles/stack-sunbird/templates/sunbird_player.env | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ansible/artifacts/sunbird/login/resources/js/login.js b/ansible/artifacts/sunbird/login/resources/js/login.js
index 06cfb9011..5044ca235 100644
--- a/ansible/artifacts/sunbird/login/resources/js/login.js
+++ b/ansible/artifacts/sunbird/login/resources/js/login.js
@@ -501,4 +501,4 @@ var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and sel
 	} else {
 		redirectToLib();
 	}
-};
+};
\ No newline at end of file
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index 43a9d0cb9..c6016a313 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -113,3 +113,6 @@ reportsListVersion={{reportsListVersion|default('v1')}}
 
 #Release-3.2.7
 sunbird_data_product_service=http://kong:8000/
+
+#Release-3.5.0
+crypto_encryption_key={{crypto_encryption_key}}

From 584b78670faaf05b497878cefac6b355b052f556 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Tue, 5 Jan 2021 11:13:37 +0530
Subject: [PATCH 088/184] feat: TG-532 Portal v2 api devops scripts (#2116)

* feat: TG-518 dependent deployment scripts for portal v2 endpoint

* fix: add portal v2 api and load keys in adminutil

* fix: rename acl and consumer group

* fix: adding new line

* fix: missing underscore

* fix: updating kong portal v2 consumer and env name

* fix: add missing dictionary
---
 ansible/roles/kong-api/defaults/main.yml      | 19 +++++++++++++++++++
 ansible/roles/kong-consumer/defaults/main.yml |  9 +++++++++
 .../roles/helm-deploy/defaults/main.yml       | 12 ++++++++++++
 .../defaults/main.yml                         | 12 ++++++++++++
 .../helm_charts/core/adminutils/values.j2     |  6 +++++-
 5 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index f98c22590..4e3c8630a 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -3190,6 +3190,24 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
+  - name: registerPortalv2
+    uris: "{{ api_manager_perfix }}/v2/consumer/portal/credential/register"
+    upstream_url: "{{ am_util_url }}/v2/consumer/portal/credential/register"
+    strip_uri: true
+    plugins:
+    - name: jwt
+    - name: cors
+    - "{{ statsd_pulgin }}"
+    - name: acl
+      config.whitelist:
+        - 'portalAdmin'
+    - name: rate-limiting
+      config.policy: local
+      config.hour: "{{ medium_rate_limit_per_hour }}"
+      config.limit_by: credential
+    - name: request-size-limiting
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
+
   - name: registerMobileDeviceOpenRAP
     uris: "{{ api_manager_perfix }}/v1/consumer/mobile_device_openrap/credential/register"
     upstream_url: "{{ am_util_url }}/v1/consumer/mobile_device_openrap/credential/register"
@@ -3577,6 +3595,7 @@ kong_apis:
       config.limit_by: ip
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
+
   - name: searchOrg
     uris: "{{ org_service_prefix }}/v1/search"
     upstream_url: "{{ learning_service_url }}/v1/org/search"
diff --git a/ansible/roles/kong-consumer/defaults/main.yml b/ansible/roles/kong-consumer/defaults/main.yml
index 2ab952531..4e8bec8ca 100644
--- a/ansible/roles/kong-consumer/defaults/main.yml
+++ b/ansible/roles/kong-consumer/defaults/main.yml
@@ -7,6 +7,9 @@ mobile_admin_groups:
 mobile_app_groups:
   - mobileAdmin
 
+potal_app_groups:
+  - portalAdmin
+
 mobile_device_groups:
   - appAccess
   - certificateAccess
@@ -103,3 +106,9 @@ kong_consumers:
   - username: mobile_devicev2
     groups: "{{ mobile_device_groups }}"
     state: present
+  - username: portal_app
+    groups: "{{ potal_app_groups }}"
+    state: present
+  - username: portalv2
+    groups: "{{ kong_all_consumer_groups }}"
+    state: present
diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index 6e960fbb8..9ed78f8ca 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -79,12 +79,15 @@ api_managerecho_liveness_readiness:
 adminutil__device_keyprefix: "device"
 adminutil__access_keyprefix: "access"
 adminutil__desktop_keyprefix: "desktop"
+adminutil_portal_keyprefix: "portal"
 adminutil__device_keystart: 0
 adminutil__device_keycount: 0
 adminutil__access_keystart: 0
 adminutil__access_keycount: 0
 adminutil__desktop_keystart: 0
 adminutil__desktop_keycount: 0
+adminutil__portal_keystart: 0
+adminutil__portal_keycount: 0
 
 adminutil_refresh_token_public_key_prefix: "refresh_token_public_key"
 adminutil_access_token_validity: 43200  # 12 hours access token validity
@@ -120,3 +123,12 @@ adminutil_keys_values:
   role_to_run:
     - decrypt.yml
     - copy-to-helm.yml
+- key_to_register: portal
+  values_to_pass:
+    basepath: "/keys/"
+    keyprefix: "{{ adminutil__portal_keyprefix }}"
+    keystart: "{{ adminutil__portal_keystart }}"
+    keycount: "{{ adminutil__portal_keycount|int }}"
+  role_to_run:
+    - decrypt.yml
+    - copy-to-helm.yml
diff --git a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
index e90d8154d..5df3ec5a2 100644
--- a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
+++ b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
@@ -6,6 +6,7 @@ kong_private_key_sign_incr: 1
 ## The below needs to be defined in private repo if you want to use this role ##
 #kong_mobile_v2_consumer: "device"
 #kong_desktop_v2_consumer: "desktop"
+#kong_portalv2_consumer: "portal"
 
 kong_mount_roles_values:
 - key_to_register: device
@@ -30,3 +31,14 @@ kong_mount_roles_values:
     - decrypt.yml
     - generate-keys.yml
     - onboard-keys.yml
+- key_to_register: portal
+  values_to_pass:
+    basepath: "{{ kong_private_key_path }}"
+    keyprefix: "{{ adminutil__portal_keyprefix }}"
+    keystart: "{{ adminutil__portal_keystart }}"
+    keycount: "{{ adminutil__portal_keycount }}"
+    kong_consumer: "{{ kong_portal_v2_consumer }}"
+  role_to_run:
+    - decrypt.yml
+    - generate-keys.yml
+    - onboard-keys.yml
diff --git a/kubernetes/helm_charts/core/adminutils/values.j2 b/kubernetes/helm_charts/core/adminutils/values.j2
index 0e2f0bdab..7c9cc6d6d 100644
--- a/kubernetes/helm_charts/core/adminutils/values.j2
+++ b/kubernetes/helm_charts/core/adminutils/values.j2
@@ -34,7 +34,7 @@ adminutilenv:
   ENDPOINTS_HEALTH_SENSITIVE: '"{{adminutil__is_health_sensitive|default('false')}}"'
   ENDPOINTS_METRICS_ID: {{adminutil__metrics_id|default('metrics')}}
   ENDPOINTS_METRICS_SENSITIVE: '"{{adminutil__is_metrics_sensitive|default('false')}}"'
-  AM_ADMIN_API_KEYS: "mobile_device,desktop_device,access"
+  AM_ADMIN_API_KEYS: "mobile_device,desktop_device,portal,access"
   AM_ADMIN_API_MOBILE_DEVICE_BASEPATH: "/keys/"
   AM_ADMIN_API_MOBILE_DEVICE_KEYPREFIX: '"{{ adminutil__device_keyprefix }}"'
   AM_ADMIN_API_MOBILE_DEVICE_KEYSTART: '"{{ adminutil__device_keystart }}"'
@@ -43,6 +43,10 @@ adminutilenv:
   AM_ADMIN_API_DESKTOP_DEVICE_KEYPREFIX: '"{{ adminutil__desktop_keyprefix }}"'
   AM_ADMIN_API_DESKTOP_DEVICE_KEYSTART: '"{{ adminutil__desktop_keystart }}"'
   AM_ADMIN_API_DESKTOP_DEVICE_KEYCOUNT: '"{{ adminutil__desktop_keycount }}"'
+  AM_ADMIN_API_PORTAL_BASEPATH: "/keys/"
+  AM_ADMIN_API_PORTAL_KEYPREFIX: '"{{ adminutil__portal_keyprefix }}"'
+  AM_ADMIN_API_PORTAL_KEYSTART: '"{{ adminutil__portal_keystart }}"'
+  AM_ADMIN_API_PORTAL_KEYCOUNT: '"{{ adminutil__portal_keycount }}"'
   AM_ADMIN_API_ACCESS_BASEPATH: "/keys/"
   AM_ADMIN_API_ACCESS_KEYPREFIX: '"{{ adminutil__access_keyprefix }}"'
   AM_ADMIN_API_ACCESS_KEYSTART: '"{{ adminutil__access_keystart }}"'

From a7bb238af2644b10dc176c3c9bf53a51d40e9e56 Mon Sep 17 00:00:00 2001
From: VenkatKadiveti <60449077+VenkatKadiveti@users.noreply.github.com>
Date: Tue, 5 Jan 2021 12:13:25 +0530
Subject: [PATCH 089/184] Issue #SB-22183 fix: Discussion forum kong api
 (#2120)

---
 ansible/roles/kong-api/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 4e3c8630a..e15fc231f 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -6077,7 +6077,7 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
-  - name: getUserDetailsOfDiscussion
+  - name: getUserDetailsByUsername
     uris: "{{ discussions_prefix }}/user/username"
     upstream_url: "{{ discussions_mw_service_url }}/user/username"
     strip_uri: true

From a25f322a518f7dd3e3130eaa674cd4a822eadb40 Mon Sep 17 00:00:00 2001
From: VenkatKadiveti <60449077+VenkatKadiveti@users.noreply.github.com>
Date: Tue, 5 Jan 2021 13:43:40 +0530
Subject: [PATCH 090/184] Issue #SB-22183 fix: Discussion forum kong api
 (#2121)

---
 ansible/roles/kong-api/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index f98c22590..c17c06686 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -6058,7 +6058,7 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
-  - name: getUserDetailsOfDiscussion
+  - name: getUserDetailsByUsername
     uris: "{{ discussions_prefix }}/user/username"
     upstream_url: "{{ discussions_mw_service_url }}/user/username"
     strip_uri: true

From 8f6c1fb5e91e5f679046a522e90e7f17b3f38c9a Mon Sep 17 00:00:00 2001
From: Nikunj Beladiya <33539271+Nik720@users.noreply.github.com>
Date: Tue, 5 Jan 2021 17:09:21 +0530
Subject: [PATCH 091/184] Issue #SB-21199 fix: added portal env variables to
 support login functionality for desktop app (#2122)

---
 ansible/roles/stack-sunbird/templates/sunbird_player.env | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index 5a207da4e..da459a5d3 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -113,4 +113,11 @@ reportsListVersion={{reportsListVersion|default('v1')}}
 
 #Release-3.2.7
 sunbird_data_product_service=http://kong:8000/
-discussions_middleware={{ discussionsmw_service_url | default('http://discussionsmw-service:3002') }}
\ No newline at end of file
+discussions_middleware={{ discussionsmw_service_url | default('http://discussionsmw-service:3002') }}
+
+#Release-3.6.0
+sunbird_google_desktop_keycloak_client_id={{sunbird_google_desktop_keycloak_client_id}}
+sunbird_google_desktop_keycloak_secret={{sunbird_google_desktop_keycloak_secret}}
+sunbird_trampoline_desktop_keycloak_client_id={{sunbird_trampoline_desktop_keycloak_client_id}}
+sunbird_trampoline_desktop_keycloak_secret={{sunbird_trampoline_desktop_keycloak_secret}}
+sunbird_desktop_keycloak_client_id={{sunbird_desktop_keycloak_client_id}}
\ No newline at end of file

From 6e6363c4069f4d888d9a8f06c35a2034d77b08c8 Mon Sep 17 00:00:00 2001
From: Nikunj Beladiya <33539271+Nik720@users.noreply.github.com>
Date: Tue, 5 Jan 2021 17:42:17 +0530
Subject: [PATCH 092/184] Issue #SB-21199 fix: added condition for desktop app
 (#2115)

---
 ansible/artifacts/sunbird/login/resources/js/login.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/artifacts/sunbird/login/resources/js/login.js b/ansible/artifacts/sunbird/login/resources/js/login.js
index 06cfb9011..720a49428 100644
--- a/ansible/artifacts/sunbird/login/resources/js/login.js
+++ b/ansible/artifacts/sunbird/login/resources/js/login.js
@@ -380,7 +380,7 @@ var forgetPassword = (redirectUrlPath) => {
 		const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
-			if(client_id === 'android'){
+			if(client_id === 'android' || client_id === 'desktop'){
 				window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
 			}
 			else{
@@ -414,7 +414,7 @@ var redirect  = (redirectUrlPath) => {
 		const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
-			if (client_id === 'android') {
+			if (client_id === 'android' ||  client_id === 'desktop') {
 				window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
 			} else {
 				window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
@@ -437,7 +437,7 @@ var handleSsoEvent  = () => {
 		const sessionUrlObj = new URL(sessionUrl);
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
-			if (client_id === 'android') {
+			if (client_id === 'android' ||  client_id === 'desktop') {
 				const ssoUrl = sessionUrlObj.protocol + '//' + sessionUrlObj.host + ssoPath;
 				window.location.href = redirect_uri + '?ssoUrl=' + ssoUrl;
 			} else {
@@ -462,7 +462,7 @@ var handleGoogleAuthEvent = () => {
 		const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
-			if (client_id === 'android') {
+			if (client_id === 'android' ||  client_id === 'desktop') {
 				let host = sessionUrlObj.host;
 				if (host.indexOf("merge.") !== -1) {
 					host = host.slice(host.indexOf("merge.") + 6, host.length);
@@ -489,7 +489,7 @@ var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and sel
 		const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
-			if (client_id === 'android') {
+			if (client_id === 'android' ||  client_id === 'desktop') {
 				window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
 			} else {
 				window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +

From 5e965f31fdea8bc67a7af4753196878081d256ee Mon Sep 17 00:00:00 2001
From: Rajesh Kumaravel <rajesh.kumaravel@tarento.com>
Date: Wed, 6 Jan 2021 10:10:02 +0530
Subject: [PATCH 093/184] Issue #SB-20650 fix: Added Kong and Redis storage env
 variables. (#2118)

* Issue #SB-20650 fix: Updated redis variables

Co-authored-by: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
---
 .../templates/sunbird_player.env              | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index da459a5d3..21eb16405 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -115,9 +115,26 @@ reportsListVersion={{reportsListVersion|default('v1')}}
 sunbird_data_product_service=http://kong:8000/
 discussions_middleware={{ discussionsmw_service_url | default('http://discussionsmw-service:3002') }}
 
-#Release-3.6.0
 sunbird_google_desktop_keycloak_client_id={{sunbird_google_desktop_keycloak_client_id}}
 sunbird_google_desktop_keycloak_secret={{sunbird_google_desktop_keycloak_secret}}
 sunbird_trampoline_desktop_keycloak_client_id={{sunbird_trampoline_desktop_keycloak_client_id}}
 sunbird_trampoline_desktop_keycloak_secret={{sunbird_trampoline_desktop_keycloak_secret}}
-sunbird_desktop_keycloak_client_id={{sunbird_desktop_keycloak_client_id}}
\ No newline at end of file
+sunbird_desktop_keycloak_client_id={{sunbird_desktop_keycloak_client_id}}
+
+#Release-3.6.0
+sunbird_kong_device_register={{sunbird_kong_device_register|default('false')}}
+sunbird_kong_device_register_token={{sunbird_kong_device_register_token|default('')}}
+
+# Allowed type sentinel/cluster/standalone(default)
+sunbird_redis_type={{sunbird_redis_type|default('standalone')}}
+# For sentinel and cluster use below.
+sunbird_redis_urls={{sunbird_redis_urls|default("redis")}}
+# In case of sentinel, add sentinel port (usually 2639)
+sunbird_redis_port={{sunbird_redis_port|default(6379)}}
+sunbird_redis_password={{sunbird_redis_password|default('none')}}
+
+# For standalone
+# Connect to 127.0.0.1:6380, db 4, using password "authpassword":
+# Ex: redis://:authpassword@127.0.0.1:6380/4
+# Ex: rediss://:authpassword@redis.my-service.com - when using TLS encryption
+portal_redis_connection_string={{portal_redis_connection_string|default('redis://:redisSuperSercretPassword@redis:6379')}}

From 412fe1c821937319d9eb88d5765401614e119c62 Mon Sep 17 00:00:00 2001
From: Nikunj Beladiya <33539271+Nik720@users.noreply.github.com>
Date: Wed, 6 Jan 2021 14:56:12 +0530
Subject: [PATCH 094/184] Issue #SB-21199 fix: added default values for env
 variables (#2123)

* Issue #SB-21199 fix: added default values for env variables
---
 .../roles/stack-sunbird/templates/sunbird_player.env | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index 21eb16405..ca2e34fb1 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -115,13 +115,13 @@ reportsListVersion={{reportsListVersion|default('v1')}}
 sunbird_data_product_service=http://kong:8000/
 discussions_middleware={{ discussionsmw_service_url | default('http://discussionsmw-service:3002') }}
 
-sunbird_google_desktop_keycloak_client_id={{sunbird_google_desktop_keycloak_client_id}}
-sunbird_google_desktop_keycloak_secret={{sunbird_google_desktop_keycloak_secret}}
-sunbird_trampoline_desktop_keycloak_client_id={{sunbird_trampoline_desktop_keycloak_client_id}}
-sunbird_trampoline_desktop_keycloak_secret={{sunbird_trampoline_desktop_keycloak_secret}}
-sunbird_desktop_keycloak_client_id={{sunbird_desktop_keycloak_client_id}}
-
 #Release-3.6.0
+sunbird_google_desktop_keycloak_client_id={{sunbird_google_desktop_keycloak_client_id|default('')}}
+sunbird_google_desktop_keycloak_secret={{sunbird_google_desktop_keycloak_secret|default('')}}
+sunbird_trampoline_desktop_keycloak_client_id={{sunbird_trampoline_desktop_keycloak_client_id|default('')}}
+sunbird_trampoline_desktop_keycloak_secret={{sunbird_trampoline_desktop_keycloak_secret|default('')}}
+sunbird_desktop_keycloak_client_id={{sunbird_desktop_keycloak_client_id|default('')}}
+
 sunbird_kong_device_register={{sunbird_kong_device_register|default('false')}}
 sunbird_kong_device_register_token={{sunbird_kong_device_register_token|default('')}}
 

From f78a053c713d9a42f18986aea7d472604d9ed344 Mon Sep 17 00:00:00 2001
From: G33tha <geethap240@gmail.com>
Date: Wed, 6 Jan 2021 15:35:00 +0530
Subject: [PATCH 095/184] added jenkins file and ansible task to upload chatbot
 config files to blob (#2124)

* added ansible role and jenkins file to upload chatbot config files

Co-authored-by: G33tha <geethap240@gmial.com>
---
 ansible/desktop-faq-upload.yml            | 16 ++++++++
 ansible/roles/upload-batch/tasks/main.yml |  8 ++++
 pipelines/upload/chatbot/Jenkinsfile      | 49 +++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 ansible/roles/upload-batch/tasks/main.yml
 create mode 100644 pipelines/upload/chatbot/Jenkinsfile

diff --git a/ansible/desktop-faq-upload.yml b/ansible/desktop-faq-upload.yml
index ae2abc086..12b2ad3d4 100644
--- a/ansible/desktop-faq-upload.yml
+++ b/ansible/desktop-faq-upload.yml
@@ -30,3 +30,19 @@
     - artifacts-upload-azure
   tags:
     - upload-label
+
+- hosts: localhost
+  become: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  vars:
+    source_path: "{{playbook_dir}}/../{{src_file_path}}"
+    destination_path: "{{destination_path}}"
+    container_name: "{{desktop_container}}"
+  environment:
+    AZURE_STORAGE_ACCOUNT: "{{ sunbird_public_storage_account_name }}"
+    AZURE_STORAGE_KEY: "{{ sunbird_public_storage_account_key }}"
+  roles:
+    - upload-batch
+  tags:
+    - upload-chatbot-config
diff --git a/ansible/roles/upload-batch/tasks/main.yml b/ansible/roles/upload-batch/tasks/main.yml
new file mode 100644
index 000000000..1055bdb7f
--- /dev/null
+++ b/ansible/roles/upload-batch/tasks/main.yml
@@ -0,0 +1,8 @@
+---
+- name: Ensure azure blob storage container exists
+  command: az storage container create --name {{ container_name }} --public-access container
+
+- name: Upload to azure blob storage
+  command: az storage blob upload-batch --destination {{ destination_path }} --source {{ source_path }}
+  async: 3600
+  poll: 10
diff --git a/pipelines/upload/chatbot/Jenkinsfile b/pipelines/upload/chatbot/Jenkinsfile
new file mode 100644
index 000000000..0ecbbcd98
--- /dev/null
+++ b/pipelines/upload/chatbot/Jenkinsfile
@@ -0,0 +1,49 @@
+@Library('deploy-conf') _
+node() {
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        stage('checkout public repo') {
+            folder = new File("$WORKSPACE/.git")
+            if (folder.exists())
+            {
+               println "Found .git folder. Clearing it.."
+               sh'git clean -fxd'
+            }
+            checkout scm
+        }
+
+        stage('clone chatbot config repo') {
+            sh("rm -rf sunbird-bot")
+            sh("git clone https://github.com/project-sunbird/sunbird-bot.git -b ${params.bot_repo_branch}")
+        }
+
+        ansiColor('xterm') {
+            stage('deploy'){
+                values = [:]
+                envDir = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-3].trim()
+                module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim()
+                jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
+                currentWs = sh(returnStdout: true, script: 'pwd').trim()
+                ansiblePlaybook = "${currentWs}/ansible/desktop-faq-upload.yml"
+                ansibleExtraArgs = "--extra-vars \" desktop_container=${params.container_name} src_file_path=${params.source_path} destination_path=${params.destination_path}\" --vault-password-file /var/lib/jenkins/secrets/vault-pass --tags ${params.tag}"
+                values.put('currentWs', currentWs)
+                values.put('env', envDir)
+                values.put('module', module)
+                values.put('jobName', jobName)
+                values.put('ansiblePlaybook', ansiblePlaybook)
+                values.put('ansibleExtraArgs', ansibleExtraArgs)
+                println values
+                ansible_playbook_run(values)
+            }
+        }
+        summary()
+     }
+    catch (err) {
+        throw err
+    }
+}

From aa08ad64c5d38586072919adcefa7b57116eb76a Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 7 Jan 2021 14:01:24 +0530
Subject: [PATCH 096/184] fix: updating parts of code incase of 0 keys -
 Adoption usecase (#2126)

---
 .../ansible/roles/helm-deploy/defaults/main.yml |  8 ++++----
 .../kong-jwt-create-adminutil/defaults/main.yml | 17 ++++++++++++-----
 .../kong-jwt-create-adminutil/tasks/main.yml    |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index 9ed78f8ca..e882cf910 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -76,10 +76,10 @@ api_managerecho_liveness_readiness:
     timeoutSeconds: 10
     failureThreshold: 5
 
-adminutil__device_keyprefix: "device"
-adminutil__access_keyprefix: "access"
-adminutil__desktop_keyprefix: "desktop"
-adminutil_portal_keyprefix: "portal"
+adminutil__device_keyprefix: "device_key"
+adminutil__access_keyprefix: "access_key"
+adminutil__desktop_keyprefix: "desktop_key"
+adminutil_portal_keyprefix: "portal_key"
 adminutil__device_keystart: 0
 adminutil__device_keycount: 0
 adminutil__access_keystart: 0
diff --git a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
index 5df3ec5a2..3b99533b4 100644
--- a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
+++ b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
@@ -2,11 +2,18 @@ kong_private_key_path: "keys"
 kong_private_key_sign_start: 0
 kong_private_key_sign_end: 1
 kong_private_key_sign_incr: 1
-
-## The below needs to be defined in private repo if you want to use this role ##
-#kong_mobile_v2_consumer: "device"
-#kong_desktop_v2_consumer: "desktop"
-#kong_portalv2_consumer: "portal"
+kong_mobile_v2_consumer: "device"
+kong_desktop_v2_consumer: "desktop"
+kong_portalv2_consumer: "portal"
+adminutil__device_keyprefix: "device_key"
+adminutil__desktop_keyprefix: "desktop_key"
+adminutil_portal_keyprefix: "portal_key"
+adminutil__device_keystart: 0
+adminutil__device_keycount: 0
+adminutil__desktop_keystart: 0
+adminutil__desktop_keycount: 0
+adminutil__portal_keystart: 0
+adminutil__portal_keycount: 0
 
 kong_mount_roles_values:
 - key_to_register: device
diff --git a/kubernetes/ansible/roles/kong-jwt-create-adminutil/tasks/main.yml b/kubernetes/ansible/roles/kong-jwt-create-adminutil/tasks/main.yml
index 5d0ebc265..fbec5f20b 100644
--- a/kubernetes/ansible/roles/kong-jwt-create-adminutil/tasks/main.yml
+++ b/kubernetes/ansible/roles/kong-jwt-create-adminutil/tasks/main.yml
@@ -7,7 +7,7 @@
     private_key_path: "{{ outer_item.0.values_to_pass.basepath }}"
     private_key_prefix: "{{ outer_item.0.values_to_pass.keyprefix }}"
     private_key_sign_start: "{{ outer_item.0.values_to_pass.keystart }}"
-    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount }}"
+    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '1'  }}"
     kong_consumer: "{{ outer_item.0.values_to_pass.kong_consumer }}"
   with_subelements:
     - "{{kong_mount_roles_values}}"

From a631e4aad3c4e318150fc9847a7b0e41b566e331 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 7 Jan 2021 14:15:46 +0530
Subject: [PATCH 097/184] fix: updating parts of code incase of 0 keys -
 Adoption usecase (#2127)

---
 .../ansible/roles/helm-deploy/defaults/main.yml      |  6 +++---
 .../kong-jwt-create-adminutil/defaults/main.yml      | 12 ++++++++----
 .../roles/kong-jwt-create-adminutil/tasks/main.yml   |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index 6e960fbb8..f9cd08806 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -76,9 +76,9 @@ api_managerecho_liveness_readiness:
     timeoutSeconds: 10
     failureThreshold: 5
 
-adminutil__device_keyprefix: "device"
-adminutil__access_keyprefix: "access"
-adminutil__desktop_keyprefix: "desktop"
+adminutil__device_keyprefix: "device_key"
+adminutil__access_keyprefix: "access_key"
+adminutil__desktop_keyprefix: "desktop_key"
 adminutil__device_keystart: 0
 adminutil__device_keycount: 0
 adminutil__access_keystart: 0
diff --git a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
index e90d8154d..184337752 100644
--- a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
+++ b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
@@ -2,10 +2,14 @@ kong_private_key_path: "keys"
 kong_private_key_sign_start: 0
 kong_private_key_sign_end: 1
 kong_private_key_sign_incr: 1
-
-## The below needs to be defined in private repo if you want to use this role ##
-#kong_mobile_v2_consumer: "device"
-#kong_desktop_v2_consumer: "desktop"
+kong_mobile_v2_consumer: "device"
+kong_desktop_v2_consumer: "desktop"
+adminutil__device_keyprefix: "device_key"
+adminutil__desktop_keyprefix: "desktop_key"
+adminutil__device_keystart: 0
+adminutil__device_keycount: 0
+adminutil__desktop_keystart: 0
+adminutil__desktop_keycount: 0
 
 kong_mount_roles_values:
 - key_to_register: device
diff --git a/kubernetes/ansible/roles/kong-jwt-create-adminutil/tasks/main.yml b/kubernetes/ansible/roles/kong-jwt-create-adminutil/tasks/main.yml
index 5d0ebc265..fbec5f20b 100644
--- a/kubernetes/ansible/roles/kong-jwt-create-adminutil/tasks/main.yml
+++ b/kubernetes/ansible/roles/kong-jwt-create-adminutil/tasks/main.yml
@@ -7,7 +7,7 @@
     private_key_path: "{{ outer_item.0.values_to_pass.basepath }}"
     private_key_prefix: "{{ outer_item.0.values_to_pass.keyprefix }}"
     private_key_sign_start: "{{ outer_item.0.values_to_pass.keystart }}"
-    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount }}"
+    private_key_sign_end: "{{ outer_item.0.values_to_pass.keycount if outer_item.0.values_to_pass.keycount > '0' else '1'  }}"
     kong_consumer: "{{ outer_item.0.values_to_pass.kong_consumer }}"
   with_subelements:
     - "{{kong_mount_roles_values}}"

From b40bfad07a0064b75006486a61bd125099939761 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 7 Jan 2021 14:33:45 +0530
Subject: [PATCH 098/184] Merge release 3.5.0 to release 3.6.0 (#2129)

* Release 3.5.0 (#2108)

* Issue #SB-21908 language changes

* Issue #SB-21856 changes for telemetry

* Issue #SB-0000 adding the crypto key

* Issue #SB-0000 adding the crypto key

* Issue #SB-22183 fix: Discussion forum kong api (#2121)

* fix: updating parts of code incase of 0 keys - Adoption usecase (#2127)

Co-authored-by: Rajeev Sathish <rajeev.sathish@tarento.com>
Co-authored-by: VenkatKadiveti <60449077+VenkatKadiveti@users.noreply.github.com>
---
 ansible/artifacts/sunbird/login/resources/js/login.js        | 2 +-
 ansible/roles/stack-sunbird/templates/sunbird_player.env     | 5 ++++-
 kubernetes/ansible/roles/helm-deploy/defaults/main.yml       | 2 +-
 .../roles/kong-jwt-create-adminutil/defaults/main.yml        | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ansible/artifacts/sunbird/login/resources/js/login.js b/ansible/artifacts/sunbird/login/resources/js/login.js
index 720a49428..378c978fd 100644
--- a/ansible/artifacts/sunbird/login/resources/js/login.js
+++ b/ansible/artifacts/sunbird/login/resources/js/login.js
@@ -501,4 +501,4 @@ var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and sel
 	} else {
 		redirectToLib();
 	}
-};
+};
\ No newline at end of file
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index ca2e34fb1..4e43d7ce9 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -113,9 +113,12 @@ reportsListVersion={{reportsListVersion|default('v1')}}
 
 #Release-3.2.7
 sunbird_data_product_service=http://kong:8000/
-discussions_middleware={{ discussionsmw_service_url | default('http://discussionsmw-service:3002') }}
+
+#Release-3.5.0
+crypto_encryption_key={{crypto_encryption_key}}
 
 #Release-3.6.0
+discussions_middleware={{ discussionsmw_service_url | default('http://discussionsmw-service:3002') }}
 sunbird_google_desktop_keycloak_client_id={{sunbird_google_desktop_keycloak_client_id|default('')}}
 sunbird_google_desktop_keycloak_secret={{sunbird_google_desktop_keycloak_secret|default('')}}
 sunbird_trampoline_desktop_keycloak_client_id={{sunbird_trampoline_desktop_keycloak_client_id|default('')}}
diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index e882cf910..ccbceceee 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -79,7 +79,7 @@ api_managerecho_liveness_readiness:
 adminutil__device_keyprefix: "device_key"
 adminutil__access_keyprefix: "access_key"
 adminutil__desktop_keyprefix: "desktop_key"
-adminutil_portal_keyprefix: "portal_key"
+adminutil__portal_keyprefix: "portal_key"
 adminutil__device_keystart: 0
 adminutil__device_keycount: 0
 adminutil__access_keystart: 0
diff --git a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
index 3b99533b4..dfea37ea4 100644
--- a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
+++ b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
@@ -7,7 +7,7 @@ kong_desktop_v2_consumer: "desktop"
 kong_portalv2_consumer: "portal"
 adminutil__device_keyprefix: "device_key"
 adminutil__desktop_keyprefix: "desktop_key"
-adminutil_portal_keyprefix: "portal_key"
+adminutil__portal_keyprefix: "portal_key"
 adminutil__device_keystart: 0
 adminutil__device_keycount: 0
 adminutil__desktop_keystart: 0

From 9be4ab73bf82de80e49efc5e82c63539408f6a02 Mon Sep 17 00:00:00 2001
From: keshavprasadms <msknext@gmail.com>
Date: Thu, 7 Jan 2021 14:50:49 +0530
Subject: [PATCH 099/184] fix: typecasting to integer

---
 kubernetes/ansible/roles/helm-deploy/defaults/main.yml    | 6 +++---
 .../roles/kong-jwt-create-adminutil/defaults/main.yml     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index ccbceceee..5b0877b9f 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -100,7 +100,7 @@ adminutil_keys_values:
   values_to_pass:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__device_keyprefix }}"
-    keystart: "{{ adminutil__device_keystart }}"
+    keystart: "{{ adminutil__device_keystart|int }}"
     keycount: "{{ adminutil__device_keycount|int }}"
   role_to_run:
     - decrypt.yml
@@ -109,7 +109,7 @@ adminutil_keys_values:
   values_to_pass:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__access_keyprefix }}"
-    keystart: "{{ adminutil__access_keystart }}"
+    keystart: "{{ adminutil__access_keystart|int }}"
     keycount: "{{ adminutil__access_keycount|int }}"
   role_to_run:
     - decrypt.yml
@@ -118,7 +118,7 @@ adminutil_keys_values:
   values_to_pass:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__desktop_keyprefix }}"
-    keystart: "{{ adminutil__desktop_keystart }}"
+    keystart: "{{ adminutil__desktop_keystart|int }}"
     keycount: "{{ adminutil__desktop_keycount|int }}"
   role_to_run:
     - decrypt.yml
diff --git a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
index dfea37ea4..624aea08c 100644
--- a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
+++ b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
@@ -20,8 +20,8 @@ kong_mount_roles_values:
   values_to_pass:
     basepath: "{{ kong_private_key_path }}"
     keyprefix: "{{ adminutil__device_keyprefix }}"
-    keystart: "{{ adminutil__device_keystart }}"
-    keycount: "{{ adminutil__device_keycount }}"
+    keystart: "{{ adminutil__device_keystart|int }}"
+    keycount: "{{ adminutil__device_keycount|int }}"
     kong_consumer: "{{ kong_mobile_v2_consumer }}"
   role_to_run:
     - decrypt.yml
@@ -31,8 +31,8 @@ kong_mount_roles_values:
   values_to_pass:
     basepath: "{{ kong_private_key_path }}"
     keyprefix: "{{ adminutil__desktop_keyprefix }}"
-    keystart: "{{ adminutil__desktop_keystart }}"
-    keycount: "{{ adminutil__desktop_keycount }}"
+    keystart: "{{ adminutil__desktop_keystart|int }}"
+    keycount: "{{ adminutil__desktop_keycount|int }}"
     kong_consumer: "{{ kong_desktop_v2_consumer }}"
   role_to_run:
     - decrypt.yml

From f69dbe1363b00856dac1799d9840d2102a28e283 Mon Sep 17 00:00:00 2001
From: keshavprasadms <msknext@gmail.com>
Date: Thu, 7 Jan 2021 14:54:14 +0530
Subject: [PATCH 100/184] fix: typecasting to integer for portal keys

---
 kubernetes/ansible/roles/helm-deploy/defaults/main.yml        | 2 +-
 .../ansible/roles/kong-jwt-create-adminutil/defaults/main.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index 5b0877b9f..19c703d0d 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -127,7 +127,7 @@ adminutil_keys_values:
   values_to_pass:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__portal_keyprefix }}"
-    keystart: "{{ adminutil__portal_keystart }}"
+    keystart: "{{ adminutil__portal_keystart|int }}"
     keycount: "{{ adminutil__portal_keycount|int }}"
   role_to_run:
     - decrypt.yml
diff --git a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
index 624aea08c..d369a1207 100644
--- a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
+++ b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
@@ -42,8 +42,8 @@ kong_mount_roles_values:
   values_to_pass:
     basepath: "{{ kong_private_key_path }}"
     keyprefix: "{{ adminutil__portal_keyprefix }}"
-    keystart: "{{ adminutil__portal_keystart }}"
-    keycount: "{{ adminutil__portal_keycount }}"
+    keystart: "{{ adminutil__portal_keystart|int }}"
+    keycount: "{{ adminutil__portal_keycount|int }}"
     kong_consumer: "{{ kong_portal_v2_consumer }}"
   role_to_run:
     - decrypt.yml

From 2e66d775341f8a56715e1a180c2c01e4b1a7eda0 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 7 Jan 2021 14:54:22 +0530
Subject: [PATCH 101/184] fix: typecasting to integer (#2130)

---
 kubernetes/ansible/roles/helm-deploy/defaults/main.yml    | 6 +++---
 .../roles/kong-jwt-create-adminutil/defaults/main.yml     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index f9cd08806..771aa3c99 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -97,7 +97,7 @@ adminutil_keys_values:
   values_to_pass:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__device_keyprefix }}"
-    keystart: "{{ adminutil__device_keystart }}"
+    keystart: "{{ adminutil__device_keystart|int }}"
     keycount: "{{ adminutil__device_keycount|int }}"
   role_to_run:
     - decrypt.yml
@@ -106,7 +106,7 @@ adminutil_keys_values:
   values_to_pass:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__access_keyprefix }}"
-    keystart: "{{ adminutil__access_keystart }}"
+    keystart: "{{ adminutil__access_keystart|int }}"
     keycount: "{{ adminutil__access_keycount|int }}"
   role_to_run:
     - decrypt.yml
@@ -115,7 +115,7 @@ adminutil_keys_values:
   values_to_pass:
     basepath: "/keys/"
     keyprefix: "{{ adminutil__desktop_keyprefix }}"
-    keystart: "{{ adminutil__desktop_keystart }}"
+    keystart: "{{ adminutil__desktop_keystart|int }}"
     keycount: "{{ adminutil__desktop_keycount|int }}"
   role_to_run:
     - decrypt.yml
diff --git a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
index 184337752..c93468bbf 100644
--- a/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
+++ b/kubernetes/ansible/roles/kong-jwt-create-adminutil/defaults/main.yml
@@ -16,8 +16,8 @@ kong_mount_roles_values:
   values_to_pass:
     basepath: "{{ kong_private_key_path }}"
     keyprefix: "{{ adminutil__device_keyprefix }}"
-    keystart: "{{ adminutil__device_keystart }}"
-    keycount: "{{ adminutil__device_keycount }}"
+    keystart: "{{ adminutil__device_keystart|int }}"
+    keycount: "{{ adminutil__device_keycount|int }}"
     kong_consumer: "{{ kong_mobile_v2_consumer }}"
   role_to_run:
     - decrypt.yml
@@ -27,8 +27,8 @@ kong_mount_roles_values:
   values_to_pass:
     basepath: "{{ kong_private_key_path }}"
     keyprefix: "{{ adminutil__desktop_keyprefix }}"
-    keystart: "{{ adminutil__desktop_keystart }}"
-    keycount: "{{ adminutil__desktop_keycount }}"
+    keystart: "{{ adminutil__desktop_keystart|int }}"
+    keycount: "{{ adminutil__desktop_keycount|int }}"
     kong_consumer: "{{ kong_desktop_v2_consumer }}"
   role_to_run:
     - decrypt.yml

From 5a28a71cf7b4a72f536c7ddd23582d7c14cf9907 Mon Sep 17 00:00:00 2001
From: Rajesh Kumaravel <rajesh.kumaravel@tarento.com>
Date: Thu, 7 Jan 2021 15:51:13 +0530
Subject: [PATCH 102/184] Issue #SB-20650 fix: Added anonymous user TTL value
 (#2132)

---
 ansible/roles/stack-sunbird/templates/sunbird_player.env | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index 4e43d7ce9..453d29ac9 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -141,3 +141,5 @@ sunbird_redis_password={{sunbird_redis_password|default('none')}}
 # Ex: redis://:authpassword@127.0.0.1:6380/4
 # Ex: rediss://:authpassword@redis.my-service.com - when using TLS encryption
 portal_redis_connection_string={{portal_redis_connection_string|default('redis://:redisSuperSercretPassword@redis:6379')}}
+
+sunbird_anonymous_session_ttl={{sunbird_anonymous_session_ttl|default(600000)}}
\ No newline at end of file

From 096bf7d0464c99b399546354f8cb54853ec05680 Mon Sep 17 00:00:00 2001
From: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Date: Thu, 7 Jan 2021 15:55:10 +0530
Subject: [PATCH 103/184] Adding crypto encryption key for encrypting user
 details in forgot password flow. (#2133)

* Adding crypto encryption key

Adding crypto encryption key

* Removed the value from common.yaml

* Adding crypto encryption key to secrets
---
 private_repo/ansible/inventory/dev/Core/common.yml  | 3 ---
 private_repo/ansible/inventory/dev/Core/secrets.yml | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/private_repo/ansible/inventory/dev/Core/common.yml b/private_repo/ansible/inventory/dev/Core/common.yml
index 3bcd12823..bf39432b0 100644
--- a/private_repo/ansible/inventory/dev/Core/common.yml
+++ b/private_repo/ansible/inventory/dev/Core/common.yml
@@ -113,9 +113,6 @@ keycloak_lb_ip:
 
 
 
-
-
-
 
 
 
diff --git a/private_repo/ansible/inventory/dev/Core/secrets.yml b/private_repo/ansible/inventory/dev/Core/secrets.yml
index f9f5043bd..ded9a370f 100644
--- a/private_repo/ansible/inventory/dev/Core/secrets.yml
+++ b/private_repo/ansible/inventory/dev/Core/secrets.yml
@@ -17,6 +17,7 @@ core_vault_proxy_site_key: |+
 core_vault_proxy_site_crt: |+
 
 core_vault_ansible_vault_password:
+crypto_encryption_key: # any crypto key of 32 bit length, used by portal to encrypt and decrypt the userDetails for forgot password flow
  
 ################### DONT FILL THESE VARIABLES INITIALLY ###################
 

From 00a62519dcdfa120fa027366844912493c85637d Mon Sep 17 00:00:00 2001
From: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Date: Thu, 7 Jan 2021 15:55:33 +0530
Subject: [PATCH 104/184] Adding crypto key for portal encryption of userdata
 (#2134)

---
 private_repo/ansible/inventory/dev/Core/secrets.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/private_repo/ansible/inventory/dev/Core/secrets.yml b/private_repo/ansible/inventory/dev/Core/secrets.yml
index f9f5043bd..3a80841d6 100644
--- a/private_repo/ansible/inventory/dev/Core/secrets.yml
+++ b/private_repo/ansible/inventory/dev/Core/secrets.yml
@@ -17,7 +17,8 @@ core_vault_proxy_site_key: |+
 core_vault_proxy_site_crt: |+
 
 core_vault_ansible_vault_password:
- 
+crypto_encryption_key: # any crypto key of 32 bit length, used by portal to encrypt and decrypt the userDetails for forgot password flow
+
 ################### DONT FILL THESE VARIABLES INITIALLY ###################
 
 core_vault_sunbird_sso_publickey:  # Get After Keycloak Deployment

From c32f0c26b5536fd6f071109adb2575f13763f22e Mon Sep 17 00:00:00 2001
From: Rajesh Kumaravel <rajesh.kumaravel@tarento.com>
Date: Thu, 7 Jan 2021 17:07:16 +0530
Subject: [PATCH 105/184] Issue #SB-20650 fix: Updated anonymous user TTL to 30
 minutes (#2136)

* Issue #SB-20650 fix: Added anonymous user TTL value

* Issue #SB-20650 fix: Updated anonymous user TTL to 30 minutes
---
 ansible/roles/stack-sunbird/templates/sunbird_player.env | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index 453d29ac9..1545ce7b1 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -142,4 +142,5 @@ sunbird_redis_password={{sunbird_redis_password|default('none')}}
 # Ex: rediss://:authpassword@redis.my-service.com - when using TLS encryption
 portal_redis_connection_string={{portal_redis_connection_string|default('redis://:redisSuperSercretPassword@redis:6379')}}
 
-sunbird_anonymous_session_ttl={{sunbird_anonymous_session_ttl|default(600000)}}
\ No newline at end of file
+# anonymous session ttl in milliseconnds
+sunbird_anonymous_session_ttl={{sunbird_anonymous_session_ttl|default(1800000)}}

From c4402d9f1a7cb79b5a0847fca28374c15d7d174f Mon Sep 17 00:00:00 2001
From: VenkatKadiveti <60449077+VenkatKadiveti@users.noreply.github.com>
Date: Thu, 7 Jan 2021 17:09:58 +0530
Subject: [PATCH 106/184] Issue #SB-22183 fix: adding nodebb env (#2135)

* Issue #SB-22183 fix: adding nodebb env
---
 .../stack-sunbird/templates/sunbird_discussions-mw-service.env   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
index f675e3832..c9f0af0c9 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
@@ -1,4 +1,5 @@
 nodebb_service_url={{ discussionsmw_nodebb_service_url | default('http://nodebb-service:4567') }}
+nodebb_api_slug={{discussionsmw_nodebb_api_slug | default('/discussions/api') }}
 
 # Steps to generating the Nodebb auth token
 # 1. Login to Nodebb (https://<domain-name>/discussions/login) as a Admin.

From 287a908813fbe68bf7731d3d9b263c09ee5d7a85 Mon Sep 17 00:00:00 2001
From: VenkatKadiveti <60449077+VenkatKadiveti@users.noreply.github.com>
Date: Thu, 7 Jan 2021 17:21:07 +0530
Subject: [PATCH 107/184] Issue #SB-22183 fix: adding nodebb write api plugin
 (#2137)

---
 pipelines/build/nodebb/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipelines/build/nodebb/Dockerfile b/pipelines/build/nodebb/Dockerfile
index 104c3d913..e9c730d08 100644
--- a/pipelines/build/nodebb/Dockerfile
+++ b/pipelines/build/nodebb/Dockerfile
@@ -15,7 +15,7 @@ RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-oidc.git
 RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-api.git
 RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-telemetry.git
 RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-azure-storage.git
-
+RUN npm install https://github.com/NodeBB/nodebb-plugin-write-api.git
 
 
 

From 20829ac53474618fd2f7a76eefd4d277254cefa8 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Thu, 7 Jan 2021 20:07:47 +0530
Subject: [PATCH 108/184] Adding default vaule for nodebb url (#2125)

* Adding default vaule for nodebb url

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* removing nodebb azure storage dependencies

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* Changing configmap for mongodb-nodebb
---
 ansible/inventory/env/group_vars/all.yml      | 19 +++++++++---------
 .../templates/sunbird_nodebb.env              |  4 ----
 .../core/nodebb/templates/configmap.yaml      | 18 +++++++++++++++++
 .../core/nodebb/templates/deployment.yaml     | 20 -------------------
 kubernetes/helm_charts/core/nodebb/values.j2  |  6 +++---
 5 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index 445a29e68..1faf34d77 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -576,19 +576,19 @@ cert_service_container_name: "{{env}}-e-credentials"
 cert_service_cloud_storage_type: "{{cert_service_cloud_storage_type}}"
 
 ### Release-2.4.0 ###
-samza_tar_files_localpath: roles/samza-jobs/defaults    
-job_names:    
-  lms.user-account-merger_1:    
-      job_file_name: 'user-account-merge'    
-  lms.sso-account-updater_1:    
-      job_file_name: 'sso-account-updater'    
-  lms.indexer_1:    
+samza_tar_files_localpath: roles/samza-jobs/defaults
+job_names:
+  lms.user-account-merger_1:
+      job_file_name: 'user-account-merge'
+  lms.sso-account-updater_1:
+      job_file_name: 'sso-account-updater'
+  lms.indexer_1:
       job_file_name: 'indexer'
   lms.notification-job_1:
       job_file_name: 'notification-job'
 
 ### api call report mailing list ####
-api_report_mailing_list: "" ## This mailing list to send the daily api count report. if adaptor want to use they have to override in common.yml   
+api_report_mailing_list: "" ## This mailing list to send the daily api count report. if adaptor want to use they have to override in common.yml
 kafka_assessment_topic: "{{env_name}}.telemetry.assess"
 
 # Portal vars for reports
@@ -597,7 +597,7 @@ kafka_assessment_topic: "{{env_name}}.telemetry.assess"
 sunbird_device_api: "{{proto}}://{{ proxy_server_name }}/api/"
 sunbird_quartz_shadow_user_migration_timer: "0 0 1 1/1 * ? *"
 
-# Learning-Service 
+# Learning-Service
 lp_cassandra_connection: "{{groups['lp-cassandra']|join(':9042,')}}:9042"
 dp_cassandra_connection: "{{groups['dp-cassandra']|join(':9042,')}}:9042"
 learning_neo4j_bolt_url: bolt://{{ groups['learning-neo4j-node1'][0] }}:7687
@@ -648,5 +648,4 @@ group_activity_agg_cache_ttl: 3600
 group_activity_agg_cache_enable: false
 
 # nodebb variables
-sunbird_nodebb_storage_key: "{{ core_vault_sunbird_nodebb_storage_key }}"
 mongo_nodebb_host: "{{ groups['mongo'] | join(':27017,')}}:27017"
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env b/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
index 1f5f3155c..e69de29bb 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
@@ -1,4 +0,0 @@
-AZURE_STORAGE_ACCOUNT={{sunbird_nodebb_storage_account}}
-AZURE_STORAGE_ACCESS_KEY={{sunbird_nodebb_storage_key}}
-AZURE_STORAGE_CONTAINER={{sunbird_nodebb_container}}
-AZURE_STORAGE_HOSTNAME={{sunbird_nodebb_hostname}}
diff --git a/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml b/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
index bdec29c8d..94560822a 100644
--- a/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
+++ b/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
@@ -1 +1,19 @@
 # This file will get replaced at runtime
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nodebb-config-json
+data:
+  config.json: |-
+     {
+         "url": "{{ .Values.nodebb_url }}",
+         "secret": "100101",
+         "database": "mongo",
+         "port": "4567",
+         "mongo": {
+             "host": "{{ .Values.mongo_nodebb_host }}",
+             "port": "27017",
+             "database": "nodebb"
+         }
+     }
diff --git a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
index 46b2eb8a4..302b1ca40 100644
--- a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
@@ -49,26 +49,6 @@ spec:
         readinessProbe:
 {{ toYaml .Values.readinessProbe | indent 10 }}
         {{- end }}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: nodebb-config-json
-data:
-  config.json: |-
-     {
-         "url": "{{ .Values.nodebb_url }}",
-         "secret": "100101",
-         "database": "mongo",
-         "port": "4567",
-         "mongo": {
-             "uri": "mongodb://{{ .Values.mongo_nodebb_host }}",
-             "username": "",
-             "password": "",
-         }
-     }
-
 ---
 apiVersion: v1
 kind: Service
diff --git a/kubernetes/helm_charts/core/nodebb/values.j2 b/kubernetes/helm_charts/core/nodebb/values.j2
index 1d7089ab1..41e826a9b 100644
--- a/kubernetes/helm_charts/core/nodebb/values.j2
+++ b/kubernetes/helm_charts/core/nodebb/values.j2
@@ -8,7 +8,7 @@ dockerhub: {{ dockerhub }}
 
 replicaCount: {{nodebb_replicacount|default(1)}}
 repository: {{nodebb_repository|default('nodebb')}}
-image_tag: {{ image_tag }} 
+image_tag: {{ image_tag }}
 resources:
   requests:
     cpu: {{nodebb_cpu_req|default('50m')}}
@@ -17,11 +17,11 @@ resources:
     cpu: {{nodebb_cpu_limit|default('1')}}
     memory: {{nodebb_mem_limit|default('1024Mi')}}
 network:
-  port: 4567 
+  port: 4567
 strategy:
   type: RollingUpdate
   maxsurge: {{ nodebb_maxsurge|default('25%') }}
   maxunavailable: {{ nodebb_maxunavailable|default('25%') }}
 
-nodebb_url: {{ sunbird_nodebb_url }}
+nodebb_url: {{ sunbird_nodebb_url | default(proto+'://'+domain_name+'/discussions') }}
 mongo_nodebb_host: {{ mongo_nodebb_host }}

From 42ed774a13b420bac7b7be7b0e16d7ab0dba1dcf Mon Sep 17 00:00:00 2001
From: Rhea Fernandes <32357913+rheafernandes@users.noreply.github.com>
Date: Fri, 8 Jan 2021 20:43:55 +0530
Subject: [PATCH 109/184] Added reject question set endpoint  (#2138)

* Added license onboarding

* removed onboarding of license apis

* Added reject api onboarding

* Fixed uris
---
 ansible/roles/kong-api/defaults/main.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index e15fc231f..cd4edfa95 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -6382,3 +6382,22 @@ kong_apis:
         config.limit_by: credential
       - name: request-size-limiting
         config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: questionSetReject
+    uris: "{{ questionset_prefix }}/v1/reject"
+    upstream_url: "{{ assessment_service_url }}/questionset/v4/reject"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAdmin'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+

From 87bfda9cb7304f760ca6b526f3846a1753816768 Mon Sep 17 00:00:00 2001
From: Kumar Gauraw <gaurawk@ilimi.in>
Date: Mon, 11 Jan 2021 11:45:39 +0530
Subject: [PATCH 110/184] Issue #SC-2141 feat: added new kafka topic (#2141)

---
 .../stack-sunbird/templates/assessment-service_application.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
index 7685cd4ea..81cccc4f9 100644
--- a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
@@ -374,7 +374,7 @@ languageCode {
 kafka {
   urls : "{{ kafka_urls }}"
   topic.send.enable : true
-  topics.instruction : "{{ env_name }}.learning.job.request"
+  topics.instruction : "{{ env_name }}.assessment.publish.request"
 }
 objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_store"
 question.keyspace="{{ lp_cassandra_keyspace_prefix }}_question_store"

From 8e64b991eb05ba5168c077106eafa1dd47638fbb Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <yravinderkumar33@gmail.com>
Date: Mon, 11 Jan 2021 12:33:17 +0530
Subject: [PATCH 111/184] Issue #SB-22405 fix: Telemetry is missing on login
 page (Normal login, Google Sign in, State Signin, Forget password, Register
 here)

---
 .../login/resources/js/jquery-3.3.1.min.js    |    2 +
 .../login/resources/js/telemetry_service.js   | 3196 +++++++++++++++++
 .../artifacts/sunbird/login/theme.properties  |    4 +-
 3 files changed, 3200 insertions(+), 2 deletions(-)
 create mode 100644 ansible/artifacts/sunbird/login/resources/js/jquery-3.3.1.min.js
 create mode 100644 ansible/artifacts/sunbird/login/resources/js/telemetry_service.js

diff --git a/ansible/artifacts/sunbird/login/resources/js/jquery-3.3.1.min.js b/ansible/artifacts/sunbird/login/resources/js/jquery-3.3.1.min.js
new file mode 100644
index 000000000..4d9b3a258
--- /dev/null
+++ b/ansible/artifacts/sunbird/login/resources/js/jquery-3.3.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.3.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,i=Object.getPrototypeOf,o=n.slice,a=n.concat,s=n.push,u=n.indexOf,l={},c=l.toString,f=l.hasOwnProperty,p=f.toString,d=p.call(Object),h={},g=function e(t){return"function"==typeof t&&"number"!=typeof t.nodeType},y=function e(t){return null!=t&&t===t.window},v={type:!0,src:!0,noModule:!0};function m(e,t,n){var i,o=(t=t||r).createElement("script");if(o.text=e,n)for(i in v)n[i]&&(o[i]=n[i]);t.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[c.call(e)]||"object":typeof e}var b="3.3.1",w=function(e,t){return new w.fn.init(e,t)},T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;w.fn=w.prototype={jquery:"3.3.1",constructor:w,length:0,toArray:function(){return o.call(this)},get:function(e){return null==e?o.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return w.each(this,e)},map:function(e){return this.pushStack(w.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(o.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:s,sort:n.sort,splice:n.splice},w.extend=w.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||g(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)n=a[t],a!==(r=e[t])&&(l&&r&&(w.isPlainObject(r)||(i=Array.isArray(r)))?(i?(i=!1,o=n&&Array.isArray(n)?n:[]):o=n&&w.isPlainObject(n)?n:{},a[t]=w.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},w.extend({expando:"jQuery"+("3.3.1"+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==c.call(e))&&(!(t=i(e))||"function"==typeof(n=f.call(t,"constructor")&&t.constructor)&&p.call(n)===d)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e){m(e)},each:function(e,t){var n,r=0;if(C(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(C(Object(e))?w.merge(n,"string"==typeof e?[e]:e):s.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:u.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)(r=!t(e[o],o))!==s&&i.push(e[o]);return i},map:function(e,t,n){var r,i,o=0,s=[];if(C(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&s.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&s.push(i);return a.apply([],s)},guid:1,support:h}),"function"==typeof Symbol&&(w.fn[Symbol.iterator]=n[Symbol.iterator]),w.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function C(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!g(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},P="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",I="\\["+M+"*("+R+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+R+"))|)"+M+"*\\]",W=":("+R+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+I+")*)|.*)\\)|)",$=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),F=new RegExp("^"+M+"*,"+M+"*"),_=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="<a id='"+b+"'></a><select id='"+b+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:he(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:he(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=r.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})r.pseudos[t]=fe(t);for(t in{submit:!0,reset:!0})r.pseudos[t]=pe(t);function ye(){}ye.prototype=r.filters=r.pseudos,r.setFilters=new ye,a=oe.tokenize=function(e,t){var n,i,o,a,s,u,l,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=r.preFilter;while(s){n&&!(i=F.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),n=!1,(i=_.exec(s))&&(n=i.shift(),o.push({value:n,type:i[0].replace(B," ")}),s=s.slice(n.length));for(a in r.filter)!(i=V[a].exec(s))||l[a]&&!(i=l[a](i))||(n=i.shift(),o.push({value:n,type:a,matches:i}),s=s.slice(n.length));if(!n)break}return t?s.length:s?oe.error(e):k(e,u).slice(0)};function ve(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function me(e,t,n){var r=t.dir,i=t.next,o=i||r,a=n&&"parentNode"===o,s=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||a)return e(t,n,i);return!1}:function(t,n,u){var l,c,f,p=[T,s];if(u){while(t=t[r])if((1===t.nodeType||a)&&e(t,n,u))return!0}else while(t=t[r])if(1===t.nodeType||a)if(f=t[b]||(t[b]={}),c=f[t.uniqueID]||(f[t.uniqueID]={}),i&&i===t.nodeName.toLowerCase())t=t[r]||t;else{if((l=c[o])&&l[0]===T&&l[1]===s)return p[2]=l[2];if(c[o]=p,p[2]=e(t,n,u))return!0}return!1}}function xe(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r<i;r++)oe(e,t[r],n);return n}function we(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Te(e,t,n,r,i,o){return r&&!r[b]&&(r=Te(r)),i&&!i[b]&&(i=Te(i,o)),se(function(o,a,s,u){var l,c,f,p=[],d=[],h=a.length,g=o||be(t||"*",s.nodeType?[s]:s,[]),y=!e||!o&&t?g:we(g,p,e,s,u),v=n?i||(o?e:h||r)?[]:a:y;if(n&&n(y,v,s,u),r){l=we(v,d),r(l,[],s,u),c=l.length;while(c--)(f=l[c])&&(v[d[c]]=!(y[d[c]]=f))}if(o){if(i||e){if(i){l=[],c=v.length;while(c--)(f=v[c])&&l.push(y[c]=f);i(null,v=[],l,u)}c=v.length;while(c--)(f=v[c])&&(l=i?O(o,f):p[c])>-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u<o;u++)if(n=r.relative[e[u].type])p=[me(xe(p),n)];else{if((n=r.filter[e[u].type].apply(null,e[u].matches))[b]){for(i=++u;i<o;i++)if(r.relative[e[i].type])break;return Te(u>1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u<i&&Ce(e.slice(u,i)),i<o&&Ce(e=e.slice(i)),i<o&&ve(e))}p.push(n)}return xe(p)}function Ee(e,t){var n=t.length>0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t<r;t++)if(w.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)w.find(e,i[t],n);return r>1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(w.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&w(e);if(!D.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s<o.length)!1===o[s].apply(n[0],n[1])&&e.stopOnFalse&&(s=o.length,n=!1)}e.memory||(n=!1),t=!1,i&&(o=n?[]:"")},l={add:function(){return o&&(n&&!t&&(s=o.length-1,a.push(n)),function t(n){w.each(n,function(n,r){g(r)?e.unique&&l.has(r)||o.push(r):r&&r.length&&"string"!==x(r)&&t(r)})}(arguments),n&&!t&&u()),this},remove:function(){return w.each(arguments,function(e,t){var n;while((n=w.inArray(t,o,n))>-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t<o)){if((e=r.apply(s,u))===n.promise())throw new TypeError("Thenable self-resolution");l=e&&("object"==typeof e||"function"==typeof e)&&e.then,g(l)?i?l.call(e,a(o,n,I,i),a(o,n,W,i)):(o++,l.call(e,a(o,n,I,i),a(o,n,W,i),a(o,n,I,n.notifyWith))):(r!==I&&(s=void 0,u=[e]),(i||n.resolveWith)(s,u))}},c=i?l:function(){try{l()}catch(e){w.Deferred.exceptionHook&&w.Deferred.exceptionHook(e,c.stackTrace),t+1>=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},X=/^-ms-/,U=/-([a-z])/g;function V(e,t){return t.toUpperCase()}function G(e){return e.replace(X,"ms-").replace(U,V)}var Y=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Q(){this.expando=w.expando+Q.uid++}Q.uid=1,Q.prototype={cache:function(e){var t=e[this.expando];return t||(t={},Y(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[G(t)]=n;else for(r in t)i[G(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][G(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(G):(t=G(t))in r?[t]:t.match(M)||[]).length;while(n--)delete r[t[n]]}(void 0===t||w.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!w.isEmptyObject(t)}};var J=new Q,K=new Q,Z=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,ee=/[A-Z]/g;function te(e){return"true"===e||"false"!==e&&("null"===e?null:e===+e+""?+e:Z.test(e)?JSON.parse(e):e)}function ne(e,t,n){var r;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(ee,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n=te(n)}catch(e){}K.set(e,t,n)}else n=void 0;return n}w.extend({hasData:function(e){return K.hasData(e)||J.hasData(e)},data:function(e,t,n){return K.access(e,t,n)},removeData:function(e,t){K.remove(e,t)},_data:function(e,t,n){return J.access(e,t,n)},_removeData:function(e,t){J.remove(e,t)}}),w.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=K.get(o),1===o.nodeType&&!J.get(o,"hasDataAttrs"))){n=a.length;while(n--)a[n]&&0===(r=a[n].name).indexOf("data-")&&(r=G(r.slice(5)),ne(o,r,i[r]));J.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof e?this.each(function(){K.set(this,e)}):z(this,function(t){var n;if(o&&void 0===t){if(void 0!==(n=K.get(o,e)))return n;if(void 0!==(n=ne(o,e)))return n}else this.each(function(){K.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?w.queue(this[0],e):void 0===t?this:this.each(function(){var n=w.queue(this,e,t);w._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&w.dequeue(this,e)})},dequeue:function(e){return this.each(function(){w.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=w.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=J.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var re=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ie=new RegExp("^(?:([+-])=|)("+re+")([a-z%]*)$","i"),oe=["Top","Right","Bottom","Left"],ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&w.contains(e.ownerDocument,e)&&"none"===w.css(e,"display")},se=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i};function ue(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return w.css(e,t,"")},u=s(),l=n&&n[3]||(w.cssNumber[t]?"":"px"),c=(w.cssNumber[t]||"px"!==l&&+u)&&ie.exec(w.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)w.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,w.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var le={};function ce(e){var t,n=e.ownerDocument,r=e.nodeName,i=le[r];return i||(t=n.body.appendChild(n.createElement(r)),i=w.css(t,"display"),t.parentNode.removeChild(t),"none"===i&&(i="block"),le[r]=i,i)}function fe(e,t){for(var n,r,i=[],o=0,a=e.length;o<a;o++)(r=e[o]).style&&(n=r.style.display,t?("none"===n&&(i[o]=J.get(r,"display")||null,i[o]||(r.style.display="")),""===r.style.display&&ae(r)&&(i[o]=ce(r))):"none"!==n&&(i[o]="none",J.set(r,"display",n)));for(o=0;o<a;o++)null!=i[o]&&(e[o].style.display=i[o]);return e}w.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?w(this).show():w(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n<r;n++)J.set(e[n],"globalEval",!t||J.get(t[n],"globalEval"))}var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===x(o))w.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+w.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;w.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&w.inArray(o,r)>-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="<textarea>x</textarea>",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n<arguments.length;n++)u[n]=arguments[n];if(t.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,t)){s=w.event.handlers.call(this,t,l),n=0;while((o=s[n++])&&!t.isPropagationStopped()){t.currentTarget=o.elem,r=0;while((a=o.handlers[r++])&&!t.isImmediatePropagationStopped())t.rnamespace&&!t.rnamespace.test(a.namespace)||(t.handleObj=a,t.data=a.data,void 0!==(i=((w.event.special[a.origType]||{}).handle||a.handler).apply(o.elem,u))&&!1===(t.result=i)&&(t.preventDefault(),t.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,t),t.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&e.button>=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?w(i,this).index(l)>-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(e,t){Object.defineProperty(w.Event.prototype,e,{enumerable:!0,configurable:!0,get:g(t)?function(){if(this.originalEvent)return t(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[e]},set:function(t){Object.defineProperty(this,e,{enumerable:!0,configurable:!0,writable:!0,value:t})}})},fix:function(e){return e[w.expando]?e:new w.Event(e)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==Se()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===Se()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&N(this,"input"))return this.click(),!1},_default:function(e){return N(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},w.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},w.Event=function(e,t){if(!(this instanceof w.Event))return new w.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ee:ke,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&w.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[w.expando]=!0},w.Event.prototype={constructor:w.Event,isDefaultPrevented:ke,isPropagationStopped:ke,isImmediatePropagationStopped:ke,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ee,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ee,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ee,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},w.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&we.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Te.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},w.event.addProp),w.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){w.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||w.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),w.fn.extend({on:function(e,t,n,r){return De(this,e,t,n,r)},one:function(e,t,n,r){return De(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,w(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=ke),this.each(function(){w.event.remove(this,e,n,t)})}});var Ne=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/<script|<style|<link/i,je=/checked\s*(?:[^=]|=\s*.checked.)/i,qe=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n<r;n++)w.event.add(t,i,l[i][n])}K.hasData(e)&&(s=K.access(e),u=w.extend({},s),K.set(t,u))}}function Me(e,t){var n=t.nodeName.toLowerCase();"input"===n&&pe.test(e.type)?t.checked=e.checked:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}function Re(e,t,n,r){t=a.apply([],t);var i,o,s,u,l,c,f=0,p=e.length,d=p-1,y=t[0],v=g(y);if(v||p>1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f<p;f++)l=i,f!==d&&(l=w.clone(l,!0,!0),u&&w.merge(s,ye(l,"script"))),n.call(e[f],l,f);if(u)for(c=s[s.length-1].ownerDocument,w.map(s,Oe),f=0;f<u;f++)l=s[f],he.test(l.type||"")&&!J.access(l,"globalEval")&&w.contains(c,l)&&(l.src&&"module"!==(l.type||"").toLowerCase()?w._evalUrl&&w._evalUrl(l.src):m(l.textContent.replace(qe,""),c,l))}return e}function Ie(e,t,n){for(var r,i=t?w.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||w.cleanData(ye(r)),r.parentNode&&(n&&w.contains(r.ownerDocument,r)&&ve(ye(r,"script")),r.parentNode.removeChild(r));return e}w.extend({htmlPrefilter:function(e){return e.replace(Ne,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r<i;r++)Me(o[r],a[r]);if(t)if(n)for(o=o||ye(e),a=a||ye(s),r=0,i=o.length;r<i;r++)Pe(o[r],a[r]);else Pe(e,s);return(a=ye(s,"script")).length>0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(w.cleanData(ye(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return Re(this,arguments,function(t){var n=this.parentNode;w.inArray(this,e)<0&&(w.cleanData(ye(this)),n&&n.replaceChild(t,this))},e)}}),w.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){w.fn[e]=function(e){for(var n,r=[],i=w(e),o=i.length-1,a=0;a<=o;a++)n=a===o?this:this.clone(!0),w(i[a])[t](n),s.apply(r,n.get());return this.pushStack(r)}});var We=new RegExp("^("+re+")(?!px)[a-z%]+$","i"),$e=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},Be=new RegExp(oe.join("|"),"i");!function(){function t(){if(c){l.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",c.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",be.appendChild(l).appendChild(c);var t=e.getComputedStyle(c);i="1%"!==t.top,u=12===n(t.marginLeft),c.style.right="60%",s=36===n(t.right),o=36===n(t.width),c.style.position="absolute",a=36===c.offsetWidth||"absolute",be.removeChild(l),c=null}}function n(e){return Math.round(parseFloat(e))}var i,o,a,s,u,l=r.createElement("div"),c=r.createElement("div");c.style&&(c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",h.clearCloneStyle="content-box"===c.style.backgroundClip,w.extend(h,{boxSizingReliable:function(){return t(),o},pixelBoxStyles:function(){return t(),s},pixelPosition:function(){return t(),i},reliableMarginLeft:function(){return t(),u},scrollboxSize:function(){return t(),a}}))}();function Fe(e,t,n){var r,i,o,a,s=e.style;return(n=n||$e(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||w.contains(e.ownerDocument,e)||(a=w.style(e,t)),!h.pixelBoxStyles()&&We.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function _e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}var ze=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ue={position:"absolute",visibility:"hidden",display:"block"},Ve={letterSpacing:"0",fontWeight:"400"},Ge=["Webkit","Moz","ms"],Ye=r.createElement("div").style;function Qe(e){if(e in Ye)return e;var t=e[0].toUpperCase()+e.slice(1),n=Ge.length;while(n--)if((e=Ge[n]+t)in Ye)return e}function Je(e){var t=w.cssProps[e];return t||(t=w.cssProps[e]=Qe(e)||e),t}function Ke(e,t,n){var r=ie.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ze(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=w.css(e,n+oe[a],!0,i)),r?("content"===n&&(u-=w.css(e,"padding"+oe[a],!0,i)),"margin"!==n&&(u-=w.css(e,"border"+oe[a]+"Width",!0,i))):(u+=w.css(e,"padding"+oe[a],!0,i),"padding"!==n?u+=w.css(e,"border"+oe[a]+"Width",!0,i):s+=w.css(e,"border"+oe[a]+"Width",!0,i));return!r&&o>=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a<i;a++)o[t[a]]=w.css(e,t[a],!1,r);return o}return void 0!==n?w.style(e,t,n):w.css(e,t)},e,t,arguments.length>1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ct(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),y=J.get(e,"fxshow");n.queue||(null==(a=w._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,w.queue(e,"fx").length||a.empty.fire()})}));for(r in t)if(i=t[r],it.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!y||void 0===y[r])continue;g=!0}d[r]=y&&y[r]||w.style(e,r)}if((u=!w.isEmptyObject(t))||!w.isEmptyObject(d)){f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=y&&y.display)&&(l=J.get(e,"display")),"none"===(c=w.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=w.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===w.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1;for(r in d)u||(y?"hidden"in y&&(g=y.hidden):y=J.access(e,"fxshow",{display:l}),o&&(y.hidden=!g),g&&fe([e],!0),p.done(function(){g||fe([e]),J.remove(e,"fxshow");for(r in d)w.style(e,r,d[r])})),u=lt(g?y[r]:0,r,p),r in y||(y[r]=u.start,g&&(u.end=u.start,u.start=0))}}function ft(e,t){var n,r,i,o,a;for(n in e)if(r=G(n),i=t[r],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=w.cssHooks[r])&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function pt(e,t,n){var r,i,o=0,a=pt.prefilters.length,s=w.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=nt||st(),n=Math.max(0,l.startTime+l.duration-t),r=1-(n/l.duration||0),o=0,a=l.tweens.length;o<a;o++)l.tweens[o].run(r);return s.notifyWith(e,[l,r,n]),r<1&&a?n:(a||s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:w.extend({},t),opts:w.extend(!0,{specialEasing:{},easing:w.easing._default},n),originalProperties:t,originalOptions:n,startTime:nt||st(),duration:n.duration,tweens:[],createTween:function(t,n){var r=w.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(ft(c,l.opts.specialEasing);o<a;o++)if(r=pt.prefilters[o].call(l,e,c,l.opts))return g(r.stop)&&(w._queueHooks(l.elem,l.opts.queue).stop=r.stop.bind(r)),r;return w.map(c,lt,l),g(l.opts.start)&&l.opts.start.call(e,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),w.fx.timer(w.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l}w.Animation=w.extend(pt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return ue(n.elem,e,ie.exec(t),n),n}]},tweener:function(e,t){g(e)?(t=e,e=["*"]):e=e.match(M);for(var n,r=0,i=e.length;r<i;r++)n=e[r],pt.tweeners[n]=pt.tweeners[n]||[],pt.tweeners[n].unshift(t)},prefilters:[ct],prefilter:function(e,t){t?pt.prefilters.unshift(e):pt.prefilters.push(e)}}),w.speed=function(e,t,n){var r=e&&"object"==typeof e?w.extend({},e):{complete:n||!n&&t||g(e)&&e,duration:e,easing:n&&t||t&&!g(t)&&t};return w.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in w.fx.speeds?r.duration=w.fx.speeds[r.duration]:r.duration=w.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){g(r.old)&&r.old.call(this),r.queue&&w.dequeue(this,r.queue)},r},w.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=w.isEmptyObject(e),o=w.speed(t,n,r),a=function(){var t=pt(this,w.extend({},e),o);(i||J.get(this,"finish"))&&t.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&!1!==e&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=w.timers,a=J.get(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&ot.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||w.dequeue(this,e)})},finish:function(e){return!1!==e&&(e=e||"fx"),this.each(function(){var t,n=J.get(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=w.timers,a=r?r.length:0;for(n.finish=!0,w.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),w.each(["toggle","show","hide"],function(e,t){var n=w.fn[t];w.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ut(t,!0),e,r,i)}}),w.each({slideDown:ut("show"),slideUp:ut("hide"),slideToggle:ut("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){w.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),w.timers=[],w.fx.tick=function(){var e,t=0,n=w.timers;for(nt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||w.fx.stop(),nt=void 0},w.fx.timer=function(e){w.timers.push(e),w.fx.start()},w.fx.interval=13,w.fx.start=function(){rt||(rt=!0,at())},w.fx.stop=function(){rt=null},w.fx.speeds={slow:600,fast:200,_default:400},w.fn.delay=function(t,n){return t=w.fx?w.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e=r.createElement("input"),t=r.createElement("select").appendChild(r.createElement("option"));e.type="checkbox",h.checkOn=""!==e.value,h.optSelected=t.selected,(e=r.createElement("input")).value="t",e.type="radio",h.radioValue="t"===e.value}();var dt,ht=w.expr.attrHandle;w.fn.extend({attr:function(e,t){return z(this,w.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!N(n.parentNode,"optgroup"))){if(t=w(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=w.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=w.inArray(w.valHooks.option.get(r),o)>-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w("<script>").prop({charset:e.scriptCharset,src:e.url}).on("load error",n=function(e){t.remove(),n=null,e&&o("error"===e.type?404:200,e.type)}),r.head.appendChild(t[0])},abort:function(){n&&n()}}}});var Yt=[],Qt=/(=)\?(?=&|$)|\?\?/;w.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Yt.pop()||w.expando+"_"+Et++;return this[e]=!0,e}}),w.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=!1!==t.jsonp&&(Qt.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&Qt.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=g(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(Qt,"$1"+i):!1!==t.jsonp&&(t.url+=(kt.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||w.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?w(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,Yt.push(i)),a&&g(o)&&o(a[0]),a=o=void 0}),"script"}),h.createHTMLDocument=function(){var e=r.implementation.createHTMLDocument("").body;return e.innerHTML="<form></form><form></form>",2===e.childNodes.length}(),w.parseHTML=function(e,t,n){if("string"!=typeof e)return[];"boolean"==typeof t&&(n=t,t=!1);var i,o,a;return t||(h.createHTMLDocument?((i=(t=r.implementation.createHTMLDocument("")).createElement("base")).href=r.location.href,t.head.appendChild(i)):t=r),o=A.exec(e),a=!n&&[],o?[t.createElement(o[1])]:(o=xe([e],t,a),a&&a.length&&w(a).remove(),w.merge([],o.childNodes))},w.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=vt(e.slice(s)),e=e.slice(0,s)),g(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&w.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?w("<div>").append(w.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},w.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){w.fn[t]=function(e){return this.on(t,e)}}),w.expr.pseudos.animated=function(e){return w.grep(w.timers,function(t){return e===t.elem}).length},w.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=w.css(e,"position"),f=w(e),p={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=w.css(e,"top"),u=w.css(e,"left"),(l=("absolute"===c||"fixed"===c)&&(o+u).indexOf("auto")>-1)?(a=(r=f.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),g(t)&&(t=t.call(e,n,w.extend({},s))),null!=t.top&&(p.top=t.top-s.top+a),null!=t.left&&(p.left=t.left-s.left+i),"using"in t?t.using.call(e,p):f.css(p)}},w.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){w.offset.setOffset(this,e,t)});var t,n,r=this[0];if(r)return r.getClientRects().length?(t=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:t.top+n.pageYOffset,left:t.left+n.pageXOffset}):{top:0,left:0}},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===w.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===w.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=w(e).offset()).top+=w.css(e,"borderTopWidth",!0),i.left+=w.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-w.css(r,"marginTop",!0),left:t.left-i.left-w.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===w.css(e,"position"))e=e.offsetParent;return e||be})}}),w.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n="pageYOffset"===t;w.fn[e]=function(r){return z(this,function(e,r,i){var o;if(y(e)?o=e:9===e.nodeType&&(o=e.defaultView),void 0===i)return o?o[t]:e[r];o?o.scrollTo(n?o.pageXOffset:i,n?i:o.pageYOffset):e[r]=i},e,r,arguments.length)}}),w.each(["top","left"],function(e,t){w.cssHooks[t]=_e(h.pixelPosition,function(e,n){if(n)return n=Fe(e,t),We.test(n)?w(e).position()[t]+"px":n})}),w.each({Height:"height",Width:"width"},function(e,t){w.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){w.fn[r]=function(i,o){var a=arguments.length&&(n||"boolean"!=typeof i),s=n||(!0===i||!0===o?"margin":"border");return z(this,function(t,n,i){var o;return y(t)?0===r.indexOf("outer")?t["inner"+e]:t.document.documentElement["client"+e]:9===t.nodeType?(o=t.documentElement,Math.max(t.body["scroll"+e],o["scroll"+e],t.body["offset"+e],o["offset"+e],o["client"+e])):void 0===i?w.css(t,n,s):w.style(t,n,i,s)},t,a?i:void 0,a)}})}),w.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,t){w.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),w.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),w.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),w.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),g(e))return r=o.call(arguments,2),i=function(){return e.apply(t||this,r.concat(o.call(arguments)))},i.guid=e.guid=e.guid||w.guid++,i},w.holdReady=function(e){e?w.readyWait++:w.ready(!0)},w.isArray=Array.isArray,w.parseJSON=JSON.parse,w.nodeName=N,w.isFunction=g,w.isWindow=y,w.camelCase=G,w.type=x,w.now=Date.now,w.isNumeric=function(e){var t=w.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return w});var Jt=e.jQuery,Kt=e.$;return w.noConflict=function(t){return e.$===w&&(e.$=Kt),t&&e.jQuery===w&&(e.jQuery=Jt),w},t||(e.jQuery=e.$=w),w});
diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
new file mode 100644
index 000000000..ed1a4ef2e
--- /dev/null
+++ b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -0,0 +1,3196 @@
+/* ajv 6.5.0: Another JSON Schema Validator */
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).Ajv=e()}}(function(){return function o(i,n,l){function u(r,e){if(!n[r]){if(!i[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(c)return c(r,!0);var a=new Error("Cannot find module '"+r+"'");throw a.code="MODULE_NOT_FOUND",a}var s=n[r]={exports:{}};i[r][0].call(s.exports,function(e){return u(i[r][1][e]||e)},s,s.exports,o,i,n,l)}return n[r].exports}for(var c="function"==typeof require&&require,e=0;e<l.length;e++)u(l[e]);return u}({1:[function(e,r,t){"use strict";var a=r.exports=function(){this._cache={}};a.prototype.put=function(e,r){this._cache[e]=r},a.prototype.get=function(e){return this._cache[e]},a.prototype.del=function(e){delete this._cache[e]},a.prototype.clear=function(){this._cache={}}},{}],2:[function(e,r,t){"use strict";var s=e("./error_classes").MissingRef;r.exports=function t(r,i,a){var n=this;if("function"!=typeof this._opts.loadSchema)throw new Error("options.loadSchema should be a function");"function"==typeof i&&(a=i,i=void 0);var e=l(r).then(function(){var e=n._addSchema(r,void 0,i);return e.validate||function(o){try{return n._compile(o)}catch(e){if(e instanceof s)return function(e){var r=e.missingSchema;if(s(r))throw new Error("Schema "+r+" is loaded but "+e.missingRef+" cannot be resolved");var t=n._loadingSchemas[r];t||(t=n._loadingSchemas[r]=n._opts.loadSchema(r)).then(a,a);return t.then(function(e){if(!s(r))return l(e).then(function(){s(r)||n.addSchema(e,r,void 0,i)})}).then(function(){return u(o)});function a(){delete n._loadingSchemas[r]}function s(e){return n._refs[e]||n._schemas[e]}}(e);throw e}}(e)});a&&e.then(function(e){a(null,e)},a);return e;function l(e){var r=e.$schema;return r&&!n.getSchema(r)?t.call(n,{$ref:r},!0):Promise.resolve()}function u(o){try{return n._compile(o)}catch(e){if(e instanceof s)return function(e){var r=e.missingSchema;if(s(r))throw new Error("Schema "+r+" is loaded but "+e.missingRef+" cannot be resolved");var t=n._loadingSchemas[r];t||(t=n._loadingSchemas[r]=n._opts.loadSchema(r)).then(a,a);return t.then(function(e){if(!s(r))return l(e).then(function(){s(r)||n.addSchema(e,r,void 0,i)})}).then(function(){return u(o)});function a(){delete n._loadingSchemas[r]}function s(e){return n._refs[e]||n._schemas[e]}}(e);throw e}}}},{"./error_classes":3}],3:[function(e,r,t){"use strict";var a=e("./resolve");function s(e,r,t){this.message=t||s.message(e,r),this.missingRef=a.url(e,r),this.missingSchema=a.normalizeId(a.fullPath(this.missingRef))}function o(e){return e.prototype=Object.create(Error.prototype),e.prototype.constructor=e}r.exports={Validation:o(function(e){this.message="validation failed",this.errors=e,this.ajv=this.validation=!0}),MissingRef:o(s)},s.message=function(e,r){return"can't resolve reference "+r+" from id "+e}},{"./resolve":6}],4:[function(e,r,t){"use strict";var a=e("./util"),o=/^(\d\d\d\d)-(\d\d)-(\d\d)$/,i=[0,31,28,31,30,31,30,31,31,30,31,30,31],n=/^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d:\d\d)?$/i,s=/^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*$/i,l=/^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i,u=/^(?:(?:[^\x00-\x20"'<>%\\^`{|}]|%[0-9a-f]{2})|\{[+#./;?&=,!@|]?(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?(?:,(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?)*\})*$/i,c=/^(?:(?:http[s\u017F]?|ftp):\/\/)(?:(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+(?::(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?@)?(?:(?!10(?:\.[0-9]{1,3}){3})(?!127(?:\.[0-9]{1,3}){3})(?!169\.254(?:\.[0-9]{1,3}){2})(?!192\.168(?:\.[0-9]{1,3}){2})(?!172\.(?:1[6-9]|2[0-9]|3[01])(?:\.[0-9]{1,3}){2})(?:[1-9][0-9]?|1[0-9][0-9]|2[01][0-9]|22[0-3])(?:\.(?:1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])){2}(?:\.(?:[1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-4]))|(?:(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)(?:\.(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)*(?:\.(?:(?:[KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]){2,})))(?::[0-9]{2,5})?(?:\/(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?$/i,h=/^(?:urn:uuid:)?[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i,d=/^(?:\/(?:[^~/]|~0|~1)*)*$/,f=/^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i,p=/^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;function m(e){return a.copy(m[e="full"==e?"full":"fast"])}function v(e){var r=e.match(o);if(!r)return!1;var t,a=+r[2],s=+r[3];return 1<=a&&a<=12&&1<=s&&s<=(2!=a||((t=+r[1])%4!=0||t%100==0&&t%400!=0)?i[a]:29)}function g(e,r){var t=e.match(n);if(!t)return!1;var a=t[1],s=t[2],o=t[3];return(a<=23&&s<=59&&o<=59||23==a&&59==s&&60==o)&&(!r||t[5])}(r.exports=m).fast={date:/^\d\d\d\d-[0-1]\d-[0-3]\d$/,time:/^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,"date-time":/^\d\d\d\d-[0-1]\d-[0-3]\d[t\s](?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d:\d\d)$/i,uri:/^(?:[a-z][a-z0-9+-.]*:)(?:\/?\/)?[^\s]*$/i,"uri-reference":/^(?:(?:[a-z][a-z0-9+-.]*:)?\/?\/)?(?:[^\\\s#][^\s#]*)?(?:#[^\\\s]*)?$/i,"uri-template":u,url:c,email:/^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$/i,hostname:s,ipv4:/^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,ipv6:/^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,regex:w,uuid:h,"json-pointer":d,"json-pointer-uri-fragment":f,"relative-json-pointer":p},m.full={date:v,time:g,"date-time":function(e){var r=e.split(y);return 2==r.length&&v(r[0])&&g(r[1],!0)},uri:function(e){return P.test(e)&&l.test(e)},"uri-reference":/^(?:[a-z][a-z0-9+\-.]*:)?(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'"()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?(?:\?(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i,"uri-template":u,url:c,email:/^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&''*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i,hostname:function(e){return e.length<=255&&s.test(e)},ipv4:/^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,ipv6:/^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,regex:w,uuid:h,"json-pointer":d,"json-pointer-uri-fragment":f,"relative-json-pointer":p};var y=/t|\s/i;var P=/\/|:/;var E=/[^\\]\\Z/;function w(e){if(E.test(e))return!1;try{return new RegExp(e),!0}catch(e){return!1}}},{"./util":10}],5:[function(e,r,t){"use strict";var $=e("./resolve"),D=e("./util"),j=e("./error_classes"),l=e("fast-json-stable-stringify"),I=e("../dotjs/validate"),O=D.ucs2length,A=e("fast-deep-equal"),C=j.Validation;function k(e,r,t){for(var a=0;a<this._compilations.length;a++){var s=this._compilations[a];if(s.schema==e&&s.root==r&&s.baseId==t)return a}return-1}function L(e,r){return"var pattern"+e+" = new RegExp("+D.toQuotedString(r[e])+");"}function z(e){return"var default"+e+" = defaults["+e+"];"}function T(e,r){return void 0===r[e]?"":"var refVal"+e+" = refVal["+e+"];"}function N(e){return"var customRule"+e+" = customRules["+e+"];"}function q(e,r){if(!e.length)return"";for(var t="",a=0;a<e.length;a++)t+=r(a,e);return t}r.exports=function u(e,c,h,r){var d=this,f=this._opts,p=[void 0],m={},v=[],t={},g=[],a={},y=[];c=c||{schema:e,refVal:p,refs:m};var s=function(e,r,t){var a=k.call(this,e,r,t);return 0<=a?{index:a,compiling:!0}:{index:a=this._compilations.length,compiling:(this._compilations[a]={schema:e,root:r,baseId:t},!1)}}.call(this,e,c,r);var o=this._compilations[s.index];if(s.compiling)return o.callValidate=function e(){var r=o.validate;var t=r.apply(this,arguments);e.errors=r.errors;return t};var P=this._formats;var E=this.RULES;try{var i=w(e,c,h,r);o.validate=i;var n=o.callValidate;return n&&(n.schema=i.schema,n.errors=null,n.refs=i.refs,n.refVal=i.refVal,n.root=i.root,n.$async=i.$async,f.sourceCode&&(n.source=i.source)),i}finally{(function(e,r,t){var a=k.call(this,e,r,t);0<=a&&this._compilations.splice(a,1)}).call(this,e,c,r)}function w(e,r,t,a){var s=!r||r&&r.schema==e;if(r.schema!=c.schema)return u.call(d,e,r,t,a);var o,i=!0===e.$async,n=I({isTop:!0,schema:e,isRoot:s,baseId:a,root:r,schemaPath:"",errSchemaPath:"#",errorPath:'""',MissingRefError:j.MissingRef,RULES:E,validate:I,util:D,resolve:$,resolveRef:S,usePattern:F,useDefault:x,useCustomRule:R,opts:f,formats:P,logger:d.logger,self:d});n=q(p,T)+q(v,L)+q(g,z)+q(y,N)+n,f.processCode&&(n=f.processCode(n));try{var l=new Function("self","RULES","formats","root","refVal","defaults","customRules","equal","ucs2length","ValidationError",n);o=l(d,E,P,c,p,g,y,A,O,C),p[0]=o}catch(e){throw d.logger.error("Error compiling schema, function code:",n),e}return o.schema=e,o.errors=null,o.refs=m,o.refVal=p,o.root=s?o:r,i&&(o.$async=!0),!0===f.sourceCode&&(o.source={code:n,patterns:v,defaults:g}),o}function S(e,r,t){r=$.url(e,r);var a,s,o=m[r];if(void 0!==o)return _(a=p[o],s="refVal["+o+"]");if(!t&&c.refs){var i=c.refs[r];if(void 0!==i)return s=b(r,a=c.refVal[i]),_(a,s)}s=b(r);var n=$.call(d,w,c,r);if(void 0===n){var l=h&&h[r];l&&(n=$.inlineRef(l,f.inlineRefs)?l:u.call(d,l,c,h,e))}if(void 0!==n)return p[m[r]]=n,_(n,s);delete m[r]}function b(e,r){var t=p.length;return p[t]=r,"refVal"+(m[e]=t)}function _(e,r){return"object"==typeof e||"boolean"==typeof e?{code:r,schema:e,inline:!0}:{code:r,$async:e&&!!e.$async}}function F(e){var r=t[e];return void 0===r&&(r=t[e]=v.length,v[r]=e),"pattern"+r}function x(e){switch(typeof e){case"boolean":case"number":return""+e;case"string":return D.toQuotedString(e);case"object":if(null===e)return"null";var r=l(e),t=a[r];return void 0===t&&(t=a[r]=g.length,g[t]=e),"default"+t}}function R(e,r,t,a){var s=e.definition.validateSchema;if(s&&!1!==d._opts.validateSchema){var o=s(r);if(!o){var i="keyword schema is invalid: "+d.errorsText(s.errors);if("log"!=d._opts.validateSchema)throw new Error(i);d.logger.error(i)}}var n,l=e.definition.compile,u=e.definition.inline,c=e.definition.macro;if(l)n=l.call(d,r,t,a);else if(c)n=c.call(d,r,t,a),!1!==f.validateSchema&&d.validateSchema(n,!0);else if(u)n=u.call(d,a,e.keyword,r,t);else if(!(n=e.definition.validate))return;if(void 0===n)throw new Error('custom keyword "'+e.keyword+'"failed to compile');var h=y.length;return{code:"customRule"+h,validate:y[h]=n}}}},{"../dotjs/validate":37,"./error_classes":3,"./resolve":6,"./util":10,"fast-deep-equal":41,"fast-json-stable-stringify":42}],6:[function(e,r,t){"use strict";var m=e("uri-js"),v=e("fast-deep-equal"),g=e("./util"),l=e("./schema_obj"),a=e("json-schema-traverse");function u(e,r,t){var a=this._refs[t];if("string"==typeof a){if(!this._refs[a])return u.call(this,e,r,a);a=this._refs[a]}if((a=a||this._schemas[t])instanceof l)return d(a.schema,this._opts.inlineRefs)?a.schema:a.validate||this._compile(a);var s,o,i,n=c.call(this,r,t);return n&&(s=n.schema,r=n.root,i=n.baseId),s instanceof l?o=s.validate||e.call(this,s.schema,r,void 0,i):void 0!==s&&(o=d(s,this._opts.inlineRefs)?s:e.call(this,s,r,void 0,i)),o}function c(e,r){var t=m.parse(r),a=f(t),s=y(this._getId(e.schema));if(a!==s){var o=P(a),i=this._refs[o];if("string"==typeof i)return function(e,r,t){var a=c.call(this,e,r);if(a){var s=a.schema,o=a.baseId;e=a.root;var i=this._getId(s);return i&&(o=p(o,i)),n.call(this,t,o,s,e)}}.call(this,e,i,t);if(i instanceof l)i.validate||this._compile(i),e=i;else{if(!((i=this._schemas[o])instanceof l))return;if(i.validate||this._compile(i),o==P(r))return{schema:i,root:e,baseId:s};e=i}if(!e.schema)return;s=y(this._getId(e.schema))}return n.call(this,t,s,e.schema,e)}(r.exports=u).normalizeId=P,u.fullPath=y,u.url=p,u.ids=function(e){var r=P(this._getId(e)),h={"":r},d={"":y(r,!1)},f={},p=this;return a(e,{allKeys:!0},function(e,r,t,a,s,o,i){if(""!==r){var n=p._getId(e),l=h[a],u=d[a]+"/"+s;if(void 0!==i&&(u+="/"+("number"==typeof i?i:g.escapeFragment(i))),"string"==typeof n){n=l=P(l?m.resolve(l,n):n);var c=p._refs[n];if("string"==typeof c&&(c=p._refs[c]),c&&c.schema){if(!v(e,c.schema))throw new Error('id "'+n+'" resolves to more than one schema')}else if(n!=P(u))if("#"==n[0]){if(f[n]&&!v(e,f[n]))throw new Error('id "'+n+'" resolves to more than one schema');f[n]=e}else p._refs[n]=u}h[r]=l,d[r]=u}}),f},u.inlineRef=d,u.schema=c;var h=g.toHash(["properties","patternProperties","enum","dependencies","definitions"]);function n(e,r,t,a){if(e.fragment=e.fragment||"","/"==e.fragment.slice(0,1)){for(var s=e.fragment.split("/"),o=1;o<s.length;o++){var i=s[o];if(i){if(void 0===(t=t[i=g.unescapeFragment(i)]))break;var n;if(!h[i]&&((n=this._getId(t))&&(r=p(r,n)),t.$ref)){var l=p(r,t.$ref),u=c.call(this,a,l);u&&(t=u.schema,a=u.root,r=u.baseId)}}}return void 0!==t&&t!==a.schema?{schema:t,root:a,baseId:r}:void 0}}var i=g.toHash(["type","format","pattern","maxLength","minLength","maxProperties","minProperties","maxItems","minItems","maximum","minimum","uniqueItems","multipleOf","required","enum"]);function d(e,r){return!1!==r&&(void 0===r||!0===r?function e(r){var t;if(Array.isArray(r)){for(var a=0;a<r.length;a++)if("object"==typeof(t=r[a])&&!e(t))return!1}else for(var s in r){if("$ref"==s)return!1;if("object"==typeof(t=r[s])&&!e(t))return!1}return!0}(e):r?function e(r){var t,a=0;if(Array.isArray(r)){for(var s=0;s<r.length;s++)if("object"==typeof(t=r[s])&&(a+=e(t)),a==1/0)return 1/0}else for(var o in r){if("$ref"==o)return 1/0;if(i[o])a++;else if("object"==typeof(t=r[o])&&(a+=e(t)+1),a==1/0)return 1/0}return a}(e)<=r:void 0)}function y(e,r){return!1!==r&&(e=P(e)),f(m.parse(e))}function f(e){return m.serialize(e).split("#")[0]+"#"}var s=/#\/?$/;function P(e){return e?e.replace(s,""):""}function p(e,r){return r=P(r),m.resolve(e,r)}},{"./schema_obj":8,"./util":10,"fast-deep-equal":41,"json-schema-traverse":43,"uri-js":44}],7:[function(e,r,t){"use strict";var o=e("../dotjs"),i=e("./util").toHash;r.exports=function(){var a=[{type:"number",rules:[{maximum:["exclusiveMaximum"]},{minimum:["exclusiveMinimum"]},"multipleOf","format"]},{type:"string",rules:["maxLength","minLength","pattern","format"]},{type:"array",rules:["maxItems","minItems","items","contains","uniqueItems"]},{type:"object",rules:["maxProperties","minProperties","required","dependencies","propertyNames",{properties:["additionalProperties","patternProperties"]}]},{rules:["$ref","const","enum","not","anyOf","oneOf","allOf","if"]}],s=["type","$comment"];return a.all=i(s),a.types=i(["number","integer","string","array","object","boolean","null"]),a.forEach(function(e){e.rules=e.rules.map(function(e){var r;if("object"==typeof e){var t=Object.keys(e)[0];r=e[t],e=t,r.forEach(function(e){s.push(e),a.all[e]=!0})}return s.push(e),a.all[e]={keyword:e,code:o[e],implements:r}}),a.all.$comment={keyword:"$comment",code:o.$comment},e.type&&(a.types[e.type]=e)}),a.keywords=i(s.concat(["$schema","$id","id","$data","title","description","default","definitions","examples","readOnly","writeOnly","contentMediaType","contentEncoding","additionalItems","then","else"])),a.custom={},a}},{"../dotjs":26,"./util":10}],8:[function(e,r,t){"use strict";var a=e("./util");r.exports=function(e){a.copy(e,this)}},{"./util":10}],9:[function(e,r,t){"use strict";r.exports=function(e){for(var r,t=0,a=e.length,s=0;s<a;)t++,55296<=(r=e.charCodeAt(s++))&&r<=56319&&s<a&&56320==(64512&(r=e.charCodeAt(s)))&&s++;return t}},{}],10:[function(e,r,t){"use strict";function o(e,r,t){var a=t?" !== ":" === ",s=t?" || ":" && ",o=t?"!":"",i=t?"":"!";switch(e){case"null":return r+a+"null";case"array":return o+"Array.isArray("+r+")";case"object":return"("+o+r+s+"typeof "+r+a+'"object"'+s+i+"Array.isArray("+r+"))";case"integer":return"(typeof "+r+a+'"number"'+s+i+"("+r+" % 1)"+s+r+a+r+")";default:return"typeof "+r+a+'"'+e+'"'}}r.exports={copy:function(e,r){for(var t in r=r||{},e)r[t]=e[t];return r},checkDataType:o,checkDataTypes:function(e,r){switch(e.length){case 1:return o(e[0],r,!0);default:var t="",a=n(e);for(var s in a.array&&a.object&&(t=a.null?"(":"(!"+r+" || ",t+="typeof "+r+' !== "object")',delete a.null,delete a.array,delete a.object),a.number&&delete a.integer,a)t+=(t?" && ":"")+o(s,r,!0);return t}},coerceToTypes:function(e,r){if(Array.isArray(r)){for(var t=[],a=0;a<r.length;a++){var s=r[a];i[s]?t[t.length]=s:"array"===e&&"array"===s&&(t[t.length]=s)}if(t.length)return t}else{if(i[r])return[r];if("array"===e&&"array"===r)return["array"]}},toHash:n,getProperty:h,escapeQuotes:l,equal:e("fast-deep-equal"),ucs2length:e("./ucs2length"),varOccurences:function(e,r){var t=e.match(new RegExp(r+="[^0-9]","g"));return t?t.length:0},varReplace:function(e,r,t){return r+="([^0-9])",t=t.replace(/\$/g,"$$$$"),e.replace(new RegExp(r,"g"),t+"$1")},cleanUpCode:function(e){return e.replace(u,"").replace(c,"").replace(d,"if (!($1))")},finalCleanUpCode:function(e,r){var t=e.match(f);t&&2==t.length&&(e=r?e.replace(m,"").replace(y,P):e.replace(p,"").replace(v,g));return(t=e.match(E))&&3===t.length?e.replace(w,""):e},schemaHasRules:function(e,r){if("boolean"==typeof e)return!e;for(var t in e)if(r[t])return!0},schemaHasRulesExcept:function(e,r,t){if("boolean"==typeof e)return!e&&"not"!=t;for(var a in e)if(a!=t&&r[a])return!0},toQuotedString:S,getPathExpr:function(e,r,t,a){return F(e,t?"'/' + "+r+(a?"":".replace(/~/g, '~0').replace(/\\//g, '~1')"):a?"'[' + "+r+" + ']'":"'[\\'' + "+r+" + '\\']'")},getPath:function(e,r,t){var a=S(t?"/"+x(r):h(r));return F(e,a)},getData:function(e,r,t){var a,s,o,i;if(""===e)return"rootData";if("/"==e[0]){if(!b.test(e))throw new Error("Invalid JSON-pointer: "+e);s=e,o="rootData"}else{if(!(i=e.match(_)))throw new Error("Invalid JSON-pointer: "+e);if(a=+i[1],"#"==(s=i[2])){if(r<=a)throw new Error("Cannot access property/index "+a+" levels up, current level is "+r);return t[r-a]}if(r<a)throw new Error("Cannot access data "+a+" levels up, current level is "+r);if(o="data"+(r-a||""),!s)return o}for(var n=o,l=s.split("/"),u=0;u<l.length;u++){var c=l[u];c&&(o+=h(R(c)),n+=" && "+o)}return n},unescapeFragment:function(e){return R(decodeURIComponent(e))},unescapeJsonPointer:R,escapeFragment:function(e){return encodeURIComponent(x(e))},escapeJsonPointer:x};var i=n(["string","number","integer","boolean","null"]);function n(e){for(var r={},t=0;t<e.length;t++)r[e[t]]=!0;return r}var a=/^[a-z$_][a-z$_0-9]*$/i,s=/'|\\/g;function h(e){return"number"==typeof e?"["+e+"]":a.test(e)?"."+e:"['"+l(e)+"']"}function l(e){return e.replace(s,"\\$&").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\f/g,"\\f").replace(/\t/g,"\\t")}var u=/else\s*{\s*}/g,c=/if\s*\([^)]+\)\s*\{\s*\}(?!\s*else)/g,d=/if\s*\(([^)]+)\)\s*\{\s*\}\s*else(?!\s*if)/g;var f=/[^v.]errors/g,p=/var errors = 0;|var vErrors = null;|validate.errors = vErrors;/g,m=/var errors = 0;|var vErrors = null;/g,v="return errors === 0;",g="validate.errors = null; return true;",y=/if \(errors === 0\) return data;\s*else throw new ValidationError\(vErrors\);/,P="return data;",E=/[^A-Za-z_$]rootData[^A-Za-z0-9_$]/g,w=/if \(rootData === undefined\) rootData = data;/;function S(e){return"'"+l(e)+"'"}var b=/^\/(?:[^~]|~0|~1)*$/,_=/^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;function F(e,r){return'""'==e?r:(e+" + "+r).replace(/' \+ '/g,"")}function x(e){return e.replace(/~/g,"~0").replace(/\//g,"~1")}function R(e){return e.replace(/~1/g,"/").replace(/~0/g,"~")}},{"./ucs2length":9,"fast-deep-equal":41}],11:[function(e,r,t){"use strict";var l=["multipleOf","maximum","exclusiveMaximum","minimum","exclusiveMinimum","maxLength","minLength","pattern","additionalItems","maxItems","minItems","uniqueItems","maxProperties","minProperties","required","additionalProperties","enum","format","const"];r.exports=function(e,r){for(var t=0;t<r.length;t++){e=JSON.parse(JSON.stringify(e));var a,s=r[t].split("/"),o=e;for(a=1;a<s.length;a++)o=o[s[a]];for(a=0;a<l.length;a++){var i=l[a],n=o[i];n&&(o[i]={anyOf:[n,{$ref:"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#"}]})}}return e}},{}],12:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n;var f="maximum"==r,p=f?"exclusiveMaximum":"exclusiveMinimum",m=e.schema[p],v=e.opts.$data&&m&&m.$data,g=f?"<":">",y=f?">":"<",P=void 0;if(v){var E=e.util.getData(m.$data,i,e.dataPathArr),w="exclusive"+o,S="exclType"+o,b="exclIsNumber"+o,_="' + "+(R="op"+o)+" + '";s+=" var schemaExcl"+o+" = "+E+"; ";var F;P=p;(F=F||[]).push(s+=" var "+w+"; var "+S+" = typeof "+(E="schemaExcl"+o)+"; if ("+S+" != 'boolean' && "+S+" != 'undefined' && "+S+" != 'number') { "),s="",!1!==e.createErrors?(s+=" { keyword: '"+(P||"_exclusiveLimit")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: {} ",!1!==e.opts.messages&&(s+=" , message: '"+p+" should be boolean' "),e.opts.verbose&&(s+=" , schema: validate.schema"+l+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var x=s;s=F.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+x+"]); ":" validate.errors = ["+x+"]; return false; ":" var err = "+x+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+=" } else if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || "),s+=" "+S+" == 'number' ? ( ("+w+" = "+a+" === undefined || "+E+" "+g+"= "+a+") ? "+h+" "+y+"= "+E+" : "+h+" "+y+" "+a+" ) : ( ("+w+" = "+E+" === true) ? "+h+" "+y+"= "+a+" : "+h+" "+y+" "+a+" ) || "+h+" !== "+h+") { var op"+o+" = "+w+" ? '"+g+"' : '"+g+"='; ",void 0===n&&(u=e.errSchemaPath+"/"+(P=p),a=E,d=v)}else{_=g;if((b="number"==typeof m)&&d){var R="'"+_+"'";s+=" if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || "),s+=" ( "+a+" === undefined || "+m+" "+g+"= "+a+" ? "+h+" "+y+"= "+m+" : "+h+" "+y+" "+a+" ) || "+h+" !== "+h+") { "}else{b&&void 0===n?(w=!0,u=e.errSchemaPath+"/"+(P=p),a=m,y+="="):(b&&(a=Math[f?"min":"max"](m,n)),m===(!b||a)?(w=!0,u=e.errSchemaPath+"/"+(P=p),y+="="):(w=!1,_+="="));R="'"+_+"'";s+=" if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || "),s+=" "+h+" "+y+" "+a+" || "+h+" !== "+h+") { "}}P=P||r,(F=F||[]).push(s),s="",!1!==e.createErrors?(s+=" { keyword: '"+(P||"_limit")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { comparison: "+R+", limit: "+a+", exclusive: "+w+" } ",!1!==e.opts.messages&&(s+=" , message: 'should be "+_+" ",s+=d?"' + "+a:a+"'"),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";x=s;return s=F.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+x+"]); ":" validate.errors = ["+x+"]; return false; ":" var err = "+x+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+=" } ",c&&(s+=" else { "),s}},{}],13:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n,s+="if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || ");var f=r,p=p||[];p.push(s+=" "+h+".length "+("maxItems"==r?">":"<")+" "+a+") { "),s="",!1!==e.createErrors?(s+=" { keyword: '"+(f||"_limitItems")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { limit: "+a+" } ",!1!==e.opts.messages&&(s+=" , message: 'should NOT have ",s+="maxItems"==r?"more":"less",s+=" than ",s+=d?"' + "+a+" + '":""+n,s+=" items' "),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var m=s;return s=p.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+="} ",c&&(s+=" else { "),s}},{}],14:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n,s+="if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || "),s+=!1===e.opts.unicode?" "+h+".length ":" ucs2length("+h+") ";var f=r,p=p||[];p.push(s+=" "+("maxLength"==r?">":"<")+" "+a+") { "),s="",!1!==e.createErrors?(s+=" { keyword: '"+(f||"_limitLength")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { limit: "+a+" } ",!1!==e.opts.messages&&(s+=" , message: 'should NOT be ",s+="maxLength"==r?"longer":"shorter",s+=" than ",s+=d?"' + "+a+" + '":""+n,s+=" characters' "),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var m=s;return s=p.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+="} ",c&&(s+=" else { "),s}},{}],15:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n,s+="if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || ");var f=r,p=p||[];p.push(s+=" Object.keys("+h+").length "+("maxProperties"==r?">":"<")+" "+a+") { "),s="",!1!==e.createErrors?(s+=" { keyword: '"+(f||"_limitProperties")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { limit: "+a+" } ",!1!==e.opts.messages&&(s+=" , message: 'should NOT have ",s+="maxProperties"==r?"more":"less",s+=" than ",s+=d?"' + "+a+" + '":""+n,s+=" properties' "),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var m=s;return s=p.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+="} ",c&&(s+=" else { "),s}},{}],16:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.schema[r],o=e.schemaPath+e.util.getProperty(r),i=e.errSchemaPath+"/"+r,n=!e.opts.allErrors,l=e.util.copy(e),u="";l.level++;var c="valid"+l.level,h=l.baseId,d=!0,f=s;if(f)for(var p,m=-1,v=f.length-1;m<v;)p=f[m+=1],e.util.schemaHasRules(p,e.RULES.all)&&(d=!1,l.schema=p,l.schemaPath=o+"["+m+"]",l.errSchemaPath=i+"/"+m,a+="  "+e.validate(l)+" ",l.baseId=h,n&&(a+=" if ("+c+") { ",u+="}"));return n&&(a+=d?" if (true) { ":" "+u.slice(0,-1)+" "),a=e.util.cleanUpCode(a)}},{}],17:[function(e,r,t){"use strict";r.exports=function(r,e,t){var a=" ",s=r.level,o=r.dataLevel,i=r.schema[e],n=r.schemaPath+r.util.getProperty(e),l=r.errSchemaPath+"/"+e,u=!r.opts.allErrors,c="data"+(o||""),h="valid"+s,d="errs__"+s,f=r.util.copy(r),p="";f.level++;var m="valid"+f.level;if(i.every(function(e){return r.util.schemaHasRules(e,r.RULES.all)})){var v=f.baseId;a+=" var "+d+" = errors; var "+h+" = false;  ";var g=r.compositeRule;r.compositeRule=f.compositeRule=!0;var y=i;if(y)for(var P,E=-1,w=y.length-1;E<w;)P=y[E+=1],f.schema=P,f.schemaPath=n+"["+E+"]",f.errSchemaPath=l+"/"+E,a+="  "+r.validate(f)+" ",f.baseId=v,a+=" "+h+" = "+h+" || "+m+"; if (!"+h+") { ",p+="}";r.compositeRule=f.compositeRule=g,a+=" "+p+" if (!"+h+") {   var err =   ",!1!==r.createErrors?(a+=" { keyword: 'anyOf' , dataPath: (dataPath || '') + "+r.errorPath+" , schemaPath: "+r.util.toQuotedString(l)+" , params: {} ",!1!==r.opts.messages&&(a+=" , message: 'should match some schema in anyOf' "),r.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+r.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",!r.compositeRule&&u&&(a+=r.async?" throw new ValidationError(vErrors); ":" validate.errors = vErrors; return false; "),a+=" } else {  errors = "+d+"; if (vErrors !== null) { if ("+d+") vErrors.length = "+d+"; else vErrors = null; } ",r.opts.allErrors&&(a+=" } "),a=r.util.cleanUpCode(a)}else u&&(a+=" if (true) { ");return a}},{}],18:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.errSchemaPath+"/"+r,o=e.util.toQuotedString(e.schema[r]);return!0===e.opts.$comment?a+=" console.log("+o+");":"function"==typeof e.opts.$comment&&(a+=" self._opts.$comment("+o+", "+e.util.toQuotedString(s)+", validate.root.schema);"),a}},{}],19:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d=e.opts.$data&&i&&i.$data;d&&(a+=" var schema"+s+" = "+e.util.getData(i.$data,o,e.dataPathArr)+"; "),d||(a+=" var schema"+s+" = validate.schema"+n+";");var f=f||[];f.push(a+="var "+h+" = equal("+c+", schema"+s+"); if (!"+h+") {   "),a="",!1!==e.createErrors?(a+=" { keyword: 'const' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { allowedValue: schema"+s+" } ",!1!==e.opts.messages&&(a+=" , message: 'should be equal to constant' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var p=a;return a=f.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+p+"]); ":" validate.errors = ["+p+"]; return false; ":" var err = "+p+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" }",u&&(a+=" else { "),a}},{}],20:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d="errs__"+s,f=e.util.copy(e);f.level++;var p="valid"+f.level,m="i"+s,v=f.dataLevel=e.dataLevel+1,g="data"+v,y=e.baseId,P=e.util.schemaHasRules(i,e.RULES.all);if(a+="var "+d+" = errors;var "+h+";",P){var E=e.compositeRule;e.compositeRule=f.compositeRule=!0,f.schema=i,f.schemaPath=n,f.errSchemaPath=l,a+=" var "+p+" = false; for (var "+m+" = 0; "+m+" < "+c+".length; "+m+"++) { ",f.errorPath=e.util.getPathExpr(e.errorPath,m,e.opts.jsonPointers,!0);var w=c+"["+m+"]";f.dataPathArr[v]=m;var S=e.validate(f);f.baseId=y,e.util.varOccurences(S,g)<2?a+=" "+e.util.varReplace(S,g,w)+" ":a+=" var "+g+" = "+w+"; "+S+" ",a+=" if ("+p+") break; }  ",e.compositeRule=f.compositeRule=E,a+="  if (!"+p+") {"}else a+=" if ("+c+".length == 0) {";var b=b||[];b.push(a),a="",!1!==e.createErrors?(a+=" { keyword: 'contains' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: {} ",!1!==e.opts.messages&&(a+=" , message: 'should contain a valid item' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var _=a;return a=b.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+_+"]); ":" validate.errors = ["+_+"]; return false; ":" var err = "+_+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } else { ",P&&(a+="  errors = "+d+"; if (vErrors !== null) { if ("+d+") vErrors.length = "+d+"; else vErrors = null; } "),e.opts.allErrors&&(a+=" } "),a=e.util.cleanUpCode(a)}},{}],21:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s,o=" ",i=e.level,n=e.dataLevel,l=e.schema[r],u=e.schemaPath+e.util.getProperty(r),c=e.errSchemaPath+"/"+r,h=!e.opts.allErrors,d="data"+(n||""),f="valid"+i,p="errs__"+i,m=e.opts.$data&&l&&l.$data;m?(o+=" var schema"+i+" = "+e.util.getData(l.$data,n,e.dataPathArr)+"; ",s="schema"+i):s=l;var v,g,y,P,E,w=this,S="definition"+i,b=w.definition,_="";if(m&&b.$data){var F=b.validateSchema;o+=" var "+S+" = RULES.custom['"+r+"'].definition; var "+(E="keywordValidate"+i)+" = "+S+".validate;"}else{if(!(P=e.useCustomRule(w,l,e.schema,e)))return;s="validate.schema"+u,E=P.code,v=b.compile,g=b.inline,y=b.macro}var x=E+".errors",R="i"+i,$="ruleErr"+i,D=b.async;if(D&&!e.async)throw new Error("async keyword in sync schema");if(g||y||(o+=x+" = null;"),o+="var "+p+" = errors;var "+f+";",m&&b.$data&&(_+="}",o+=" if ("+s+" === undefined) { "+f+" = true; } else { ",F&&(_+="}",o+=" "+f+" = "+S+".validateSchema("+s+"); if ("+f+") { ")),g)o+=b.statements?" "+P.validate+" ":" "+f+" = "+P.validate+"; ";else if(y){var j=e.util.copy(e);_="";j.level++;var I="valid"+j.level;j.schema=P.validate,j.schemaPath="";var O=e.compositeRule;e.compositeRule=j.compositeRule=!0;var A=e.validate(j).replace(/validate\.schema/g,E);e.compositeRule=j.compositeRule=O,o+=" "+A}else{(z=z||[]).push(o),o="",o+="  "+E+".call( ",o+=e.opts.passContext?"this":"self",o+=v||!1===b.schema?" , "+d+" ":" , "+s+" , "+d+" , validate.schema"+e.schemaPath+" ",o+=" , (dataPath || '')",'""'!=e.errorPath&&(o+=" + "+e.errorPath);var C=n?"data"+(n-1||""):"parentData",k=n?e.dataPathArr[n]:"parentDataProperty",L=o+=" , "+C+" , "+k+" , rootData )  ";o=z.pop(),!1===b.errors?(o+=" "+f+" = ",D&&(o+="await "),o+=L+"; "):o+=D?" var "+(x="customErrors"+i)+" = null; try { "+f+" = await "+L+"; } catch (e) { "+f+" = false; if (e instanceof ValidationError) "+x+" = e.errors; else throw e; } ":" "+x+" = null; "+f+" = "+L+"; "}if(b.modifying&&(o+=" if ("+C+") "+d+" = "+C+"["+k+"];"),o+=""+_,b.valid)h&&(o+=" if (true) { ");else{var z;o+=" if ( ",void 0===b.valid?(o+=" !",o+=y?""+I:""+f):o+=" "+!b.valid+" ",a=w.keyword,(z=z||[]).push(o+=") { "),(z=z||[]).push(o=""),o="",!1!==e.createErrors?(o+=" { keyword: '"+(a||"custom")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(c)+" , params: { keyword: '"+w.keyword+"' } ",!1!==e.opts.messages&&(o+=" , message: 'should pass \""+w.keyword+"\" keyword validation' "),e.opts.verbose&&(o+=" , schema: validate.schema"+u+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+d+" "),o+=" } "):o+=" {} ";var T=o;o=z.pop();var N=o+=!e.compositeRule&&h?e.async?" throw new ValidationError(["+T+"]); ":" validate.errors = ["+T+"]; return false; ":" var err = "+T+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ";o=z.pop(),g?b.errors?"full"!=b.errors&&(o+="  for (var "+R+"="+p+"; "+R+"<errors; "+R+"++) { var "+$+" = vErrors["+R+"]; if ("+$+".dataPath === undefined) "+$+".dataPath = (dataPath || '') + "+e.errorPath+"; if ("+$+".schemaPath === undefined) { "+$+'.schemaPath = "'+c+'"; } ',e.opts.verbose&&(o+=" "+$+".schema = "+s+"; "+$+".data = "+d+"; "),o+=" } "):!1===b.errors?o+=" "+N+" ":(o+=" if ("+p+" == errors) { "+N+" } else {  for (var "+R+"="+p+"; "+R+"<errors; "+R+"++) { var "+$+" = vErrors["+R+"]; if ("+$+".dataPath === undefined) "+$+".dataPath = (dataPath || '') + "+e.errorPath+"; if ("+$+".schemaPath === undefined) { "+$+'.schemaPath = "'+c+'"; } ',e.opts.verbose&&(o+=" "+$+".schema = "+s+"; "+$+".data = "+d+"; "),o+=" } } "):y?(o+="   var err =   ",!1!==e.createErrors?(o+=" { keyword: '"+(a||"custom")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(c)+" , params: { keyword: '"+w.keyword+"' } ",!1!==e.opts.messages&&(o+=" , message: 'should pass \""+w.keyword+"\" keyword validation' "),e.opts.verbose&&(o+=" , schema: validate.schema"+u+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+d+" "),o+=" } "):o+=" {} ",o+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",!e.compositeRule&&h&&(o+=e.async?" throw new ValidationError(vErrors); ":" validate.errors = vErrors; return false; ")):!1===b.errors?o+=" "+N+" ":(o+=" if (Array.isArray("+x+")) { if (vErrors === null) vErrors = "+x+"; else vErrors = vErrors.concat("+x+"); errors = vErrors.length;  for (var "+R+"="+p+"; "+R+"<errors; "+R+"++) { var "+$+" = vErrors["+R+"]; if ("+$+".dataPath === undefined) "+$+".dataPath = (dataPath || '') + "+e.errorPath+";  "+$+'.schemaPath = "'+c+'";  ',e.opts.verbose&&(o+=" "+$+".schema = "+s+"; "+$+".data = "+d+"; "),o+=" } } else { "+N+" } "),o+=" } ",h&&(o+=" else { ")}return o}},{}],22:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="errs__"+s,d=e.util.copy(e),f="";d.level++;var p="valid"+d.level,m={},v={},g=e.opts.ownProperties;for(w in i){var y=i[w],P=Array.isArray(y)?v:m;P[w]=y}a+="var "+h+" = errors;";var E=e.errorPath;for(var w in a+="var missing"+s+";",v)if((P=v[w]).length){if(a+=" if ( "+c+e.util.getProperty(w)+" !== undefined ",g&&(a+=" && Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(w)+"') "),u){a+=" && ( ";var S=P;if(S)for(var b=-1,_=S.length-1;b<_;){j=S[b+=1],b&&(a+=" || "),a+=" ( ( "+(C=c+(A=e.util.getProperty(j)))+" === undefined ",g&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(j)+"') "),a+=") && (missing"+s+" = "+e.util.toQuotedString(e.opts.jsonPointers?j:A)+") ) "}a+=")) {  ";var F="missing"+s,x="' + "+F+" + '";e.opts._errorDataPathProperty&&(e.errorPath=e.opts.jsonPointers?e.util.getPathExpr(E,F,!0):E+" + "+F);var R=R||[];R.push(a),a="",!1!==e.createErrors?(a+=" { keyword: 'dependencies' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { property: '"+e.util.escapeQuotes(w)+"', missingProperty: '"+x+"', depsCount: "+P.length+", deps: '"+e.util.escapeQuotes(1==P.length?P[0]:P.join(", "))+"' } ",!1!==e.opts.messages&&(a+=" , message: 'should have ",a+=1==P.length?"property "+e.util.escapeQuotes(P[0]):"properties "+e.util.escapeQuotes(P.join(", ")),a+=" when property "+e.util.escapeQuotes(w)+" is present' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var $=a;a=R.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+$+"]); ":" validate.errors = ["+$+"]; return false; ":" var err = "+$+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; "}else{a+=" ) { ";var D=P;if(D)for(var j,I=-1,O=D.length-1;I<O;){j=D[I+=1];var A=e.util.getProperty(j),C=(x=e.util.escapeQuotes(j),c+A);e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPath(E,j,e.opts.jsonPointers)),a+=" if ( "+C+" === undefined ",g&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(j)+"') "),a+=") {  var err =   ",!1!==e.createErrors?(a+=" { keyword: 'dependencies' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { property: '"+e.util.escapeQuotes(w)+"', missingProperty: '"+x+"', depsCount: "+P.length+", deps: '"+e.util.escapeQuotes(1==P.length?P[0]:P.join(", "))+"' } ",!1!==e.opts.messages&&(a+=" , message: 'should have ",a+=1==P.length?"property "+e.util.escapeQuotes(P[0]):"properties "+e.util.escapeQuotes(P.join(", ")),a+=" when property "+e.util.escapeQuotes(w)+" is present' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } "}}a+=" }   ",u&&(f+="}",a+=" else { ")}e.errorPath=E;var k=d.baseId;for(var w in m){e.util.schemaHasRules(y=m[w],e.RULES.all)&&(a+=" "+p+" = true; if ( "+c+e.util.getProperty(w)+" !== undefined ",g&&(a+=" && Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(w)+"') "),a+=") { ",d.schema=y,d.schemaPath=n+e.util.getProperty(w),d.errSchemaPath=l+"/"+e.util.escapeFragment(w),a+="  "+e.validate(d)+" ",d.baseId=k,a+=" }  ",u&&(a+=" if ("+p+") { ",f+="}"))}return u&&(a+="   "+f+" if ("+h+" == errors) {"),a=e.util.cleanUpCode(a)}},{}],23:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d=e.opts.$data&&i&&i.$data;d&&(a+=" var schema"+s+" = "+e.util.getData(i.$data,o,e.dataPathArr)+"; ");var f="i"+s,p="schema"+s;d||(a+=" var "+p+" = validate.schema"+n+";"),a+="var "+h+";",d&&(a+=" if (schema"+s+" === undefined) "+h+" = true; else if (!Array.isArray(schema"+s+")) "+h+" = false; else {"),a+=h+" = false;for (var "+f+"=0; "+f+"<"+p+".length; "+f+"++) if (equal("+c+", "+p+"["+f+"])) { "+h+" = true; break; }",d&&(a+="  }  ");var m=m||[];m.push(a+=" if (!"+h+") {   "),a="",!1!==e.createErrors?(a+=" { keyword: 'enum' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { allowedValues: schema"+s+" } ",!1!==e.opts.messages&&(a+=" , message: 'should be equal to one of the allowed values' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var v=a;return a=m.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+v+"]); ":" validate.errors = ["+v+"]; return false; ":" var err = "+v+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" }",u&&(a+=" else { "),a}},{}],24:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||"");if(!1===e.opts.format)return u&&(a+=" if (true) { "),a;var h,d=e.opts.$data&&i&&i.$data;d?(a+=" var schema"+s+" = "+e.util.getData(i.$data,o,e.dataPathArr)+"; ",h="schema"+s):h=i;var f=e.opts.unknownFormats,p=Array.isArray(f);if(d){a+=" var "+(m="format"+s)+" = formats["+h+"]; var "+(v="isObject"+s)+" = typeof "+m+" == 'object' && !("+m+" instanceof RegExp) && "+m+".validate; var "+(g="formatType"+s)+" = "+v+" && "+m+".type || 'string'; if ("+v+") { ",e.async&&(a+=" var async"+s+" = "+m+".async; "),a+=" "+m+" = "+m+".validate; } if (  ",d&&(a+=" ("+h+" !== undefined && typeof "+h+" != 'string') || "),a+=" (","ignore"!=f&&(a+=" ("+h+" && !"+m+" ",p&&(a+=" && self._opts.unknownFormats.indexOf("+h+") == -1 "),a+=") || "),a+=" ("+m+" && "+g+" == '"+t+"' && !(typeof "+m+" == 'function' ? ",a+=e.async?" (async"+s+" ? await "+m+"("+c+") : "+m+"("+c+")) ":" "+m+"("+c+") ",a+=" : "+m+".test("+c+"))))) {"}else{var m;if(!(m=e.formats[i])){if("ignore"==f)return e.logger.warn('unknown format "'+i+'" ignored in schema at path "'+e.errSchemaPath+'"'),u&&(a+=" if (true) { "),a;if(p&&0<=f.indexOf(i))return u&&(a+=" if (true) { "),a;throw new Error('unknown format "'+i+'" is used in schema at path "'+e.errSchemaPath+'"')}var v,g=(v="object"==typeof m&&!(m instanceof RegExp)&&m.validate)&&m.type||"string";if(v){var y=!0===m.async;m=m.validate}if(g!=t)return u&&(a+=" if (true) { "),a;if(y){if(!e.async)throw new Error("async format in sync schema");a+=" if (!(await "+(P="formats"+e.util.getProperty(i)+".validate")+"("+c+"))) { "}else{a+=" if (! ";var P="formats"+e.util.getProperty(i);v&&(P+=".validate"),a+="function"==typeof m?" "+P+"("+c+") ":" "+P+".test("+c+") ",a+=") { "}}var E=E||[];E.push(a),a="",!1!==e.createErrors?(a+=" { keyword: 'format' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { format:  ",a+=d?""+h:""+e.util.toQuotedString(i),a+="  } ",!1!==e.opts.messages&&(a+=" , message: 'should match format \"",a+=d?"' + "+h+" + '":""+e.util.escapeQuotes(i),a+="\"' "),e.opts.verbose&&(a+=" , schema:  ",a+=d?"validate.schema"+n:""+e.util.toQuotedString(i),a+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var w=a;return a=E.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+w+"]); ":" validate.errors = ["+w+"]; return false; ":" var err = "+w+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } ",u&&(a+=" else { "),a}},{}],25:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d="errs__"+s,f=e.util.copy(e);f.level++;var p="valid"+f.level,m=e.schema.then,v=e.schema.else,g=void 0!==m&&e.util.schemaHasRules(m,e.RULES.all),y=void 0!==v&&e.util.schemaHasRules(v,e.RULES.all),P=f.baseId;if(g||y){var E;f.createErrors=!1,f.schema=i,f.schemaPath=n,f.errSchemaPath=l,a+=" var "+d+" = errors; var "+h+" = true;  ";var w=e.compositeRule;e.compositeRule=f.compositeRule=!0,a+="  "+e.validate(f)+" ",f.baseId=P,f.createErrors=!0,a+="  errors = "+d+"; if (vErrors !== null) { if ("+d+") vErrors.length = "+d+"; else vErrors = null; }  ",e.compositeRule=f.compositeRule=w,g?(a+=" if ("+p+") {  ",f.schema=e.schema.then,f.schemaPath=e.schemaPath+".then",f.errSchemaPath=e.errSchemaPath+"/then",a+="  "+e.validate(f)+" ",f.baseId=P,a+=" "+h+" = "+p+"; ",g&&y?a+=" var "+(E="ifClause"+s)+" = 'then'; ":E="'then'",a+=" } ",y&&(a+=" else { ")):a+=" if (!"+p+") { ",y&&(f.schema=e.schema.else,f.schemaPath=e.schemaPath+".else",f.errSchemaPath=e.errSchemaPath+"/else",a+="  "+e.validate(f)+" ",f.baseId=P,a+=" "+h+" = "+p+"; ",g&&y?a+=" var "+(E="ifClause"+s)+" = 'else'; ":E="'else'",a+=" } "),a+=" if (!"+h+") {   var err =   ",!1!==e.createErrors?(a+=" { keyword: 'if' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { failingKeyword: "+E+" } ",!1!==e.opts.messages&&(a+=" , message: 'should match \"' + "+E+" + '\" schema' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",!e.compositeRule&&u&&(a+=e.async?" throw new ValidationError(vErrors); ":" validate.errors = vErrors; return false; "),a+=" }   ",u&&(a+=" else { "),a=e.util.cleanUpCode(a)}else u&&(a+=" if (true) { ");return a}},{}],26:[function(e,r,t){"use strict";r.exports={$ref:e("./ref"),allOf:e("./allOf"),anyOf:e("./anyOf"),$comment:e("./comment"),const:e("./const"),contains:e("./contains"),dependencies:e("./dependencies"),enum:e("./enum"),format:e("./format"),if:e("./if"),items:e("./items"),maximum:e("./_limit"),minimum:e("./_limit"),maxItems:e("./_limitItems"),minItems:e("./_limitItems"),maxLength:e("./_limitLength"),minLength:e("./_limitLength"),maxProperties:e("./_limitProperties"),minProperties:e("./_limitProperties"),multipleOf:e("./multipleOf"),not:e("./not"),oneOf:e("./oneOf"),pattern:e("./pattern"),properties:e("./properties"),propertyNames:e("./propertyNames"),required:e("./required"),uniqueItems:e("./uniqueItems"),validate:e("./validate")}},{"./_limit":12,"./_limitItems":13,"./_limitLength":14,"./_limitProperties":15,"./allOf":16,"./anyOf":17,"./comment":18,"./const":19,"./contains":20,"./dependencies":22,"./enum":23,"./format":24,"./if":25,"./items":27,"./multipleOf":28,"./not":29,"./oneOf":30,"./pattern":31,"./properties":32,"./propertyNames":33,"./ref":34,"./required":35,"./uniqueItems":36,"./validate":37}],27:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d="errs__"+s,f=e.util.copy(e),p="";f.level++;var m="valid"+f.level,v="i"+s,g=f.dataLevel=e.dataLevel+1,y="data"+g,P=e.baseId;if(a+="var "+d+" = errors;var "+h+";",Array.isArray(i)){var E=e.schema.additionalItems;if(!1===E){a+=" "+h+" = "+c+".length <= "+i.length+"; ";var w=l;l=e.errSchemaPath+"/additionalItems";var S=S||[];S.push(a+="  if (!"+h+") {   "),a="",!1!==e.createErrors?(a+=" { keyword: 'additionalItems' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { limit: "+i.length+" } ",!1!==e.opts.messages&&(a+=" , message: 'should NOT have more than "+i.length+" items' "),e.opts.verbose&&(a+=" , schema: false , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var b=a;a=S.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+b+"]); ":" validate.errors = ["+b+"]; return false; ":" var err = "+b+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } ",l=w,u&&(p+="}",a+=" else { ")}var _=i;if(_)for(var F,x=-1,R=_.length-1;x<R;)if(F=_[x+=1],e.util.schemaHasRules(F,e.RULES.all)){a+=" "+m+" = true; if ("+c+".length > "+x+") { ";var $=c+"["+x+"]";f.schema=F,f.schemaPath=n+"["+x+"]",f.errSchemaPath=l+"/"+x,f.errorPath=e.util.getPathExpr(e.errorPath,x,e.opts.jsonPointers,!0),f.dataPathArr[g]=x;var D=e.validate(f);f.baseId=P,e.util.varOccurences(D,y)<2?a+=" "+e.util.varReplace(D,y,$)+" ":a+=" var "+y+" = "+$+"; "+D+" ",a+=" }  ",u&&(a+=" if ("+m+") { ",p+="}")}if("object"==typeof E&&e.util.schemaHasRules(E,e.RULES.all)){f.schema=E,f.schemaPath=e.schemaPath+".additionalItems",f.errSchemaPath=e.errSchemaPath+"/additionalItems",a+=" "+m+" = true; if ("+c+".length > "+i.length+") {  for (var "+v+" = "+i.length+"; "+v+" < "+c+".length; "+v+"++) { ",f.errorPath=e.util.getPathExpr(e.errorPath,v,e.opts.jsonPointers,!0);$=c+"["+v+"]";f.dataPathArr[g]=v;D=e.validate(f);f.baseId=P,e.util.varOccurences(D,y)<2?a+=" "+e.util.varReplace(D,y,$)+" ":a+=" var "+y+" = "+$+"; "+D+" ",u&&(a+=" if (!"+m+") break; "),a+=" } }  ",u&&(a+=" if ("+m+") { ",p+="}")}}else if(e.util.schemaHasRules(i,e.RULES.all)){f.schema=i,f.schemaPath=n,f.errSchemaPath=l,a+="  for (var "+v+" = 0; "+v+" < "+c+".length; "+v+"++) { ",f.errorPath=e.util.getPathExpr(e.errorPath,v,e.opts.jsonPointers,!0);$=c+"["+v+"]";f.dataPathArr[g]=v;D=e.validate(f);f.baseId=P,e.util.varOccurences(D,y)<2?a+=" "+e.util.varReplace(D,y,$)+" ":a+=" var "+y+" = "+$+"; "+D+" ",u&&(a+=" if (!"+m+") break; "),a+=" }"}return u&&(a+=" "+p+" if ("+d+" == errors) {"),a=e.util.cleanUpCode(a)}},{}],28:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n,s+="var division"+o+";if (",d&&(s+=" "+a+" !== undefined && ( typeof "+a+" != 'number' || "),s+=" (division"+o+" = "+h+" / "+a+", ",s+=e.opts.multipleOfPrecision?" Math.abs(Math.round(division"+o+") - division"+o+") > 1e-"+e.opts.multipleOfPrecision+" ":" division"+o+" !== parseInt(division"+o+") ",s+=" ) ",d&&(s+="  )  ");var f=f||[];f.push(s+=" ) {   "),s="",!1!==e.createErrors?(s+=" { keyword: 'multipleOf' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { multipleOf: "+a+" } ",!1!==e.opts.messages&&(s+=" , message: 'should be multiple of ",s+=d?"' + "+a:a+"'"),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var p=s;return s=f.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+p+"]); ":" validate.errors = ["+p+"]; return false; ":" var err = "+p+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+="} ",c&&(s+=" else { "),s}},{}],29:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="errs__"+s,d=e.util.copy(e);d.level++;var f="valid"+d.level;if(e.util.schemaHasRules(i,e.RULES.all)){d.schema=i,d.schemaPath=n,d.errSchemaPath=l,a+=" var "+h+" = errors;  ";var p,m=e.compositeRule;e.compositeRule=d.compositeRule=!0,d.createErrors=!1,d.opts.allErrors&&(p=d.opts.allErrors,d.opts.allErrors=!1),a+=" "+e.validate(d)+" ",d.createErrors=!0,p&&(d.opts.allErrors=p),e.compositeRule=d.compositeRule=m;var v=v||[];v.push(a+=" if ("+f+") {   "),a="",!1!==e.createErrors?(a+=" { keyword: 'not' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: {} ",!1!==e.opts.messages&&(a+=" , message: 'should NOT be valid' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var g=a;a=v.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+g+"]); ":" validate.errors = ["+g+"]; return false; ":" var err = "+g+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } else {  errors = "+h+"; if (vErrors !== null) { if ("+h+") vErrors.length = "+h+"; else vErrors = null; } ",e.opts.allErrors&&(a+=" } ")}else a+="  var err =   ",!1!==e.createErrors?(a+=" { keyword: 'not' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: {} ",!1!==e.opts.messages&&(a+=" , message: 'should NOT be valid' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",u&&(a+=" if (false) { ");return a}},{}],30:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d="errs__"+s,f=e.util.copy(e),p="";f.level++;var m="valid"+f.level,v=f.baseId,g="prevValid"+s,y="passingSchemas"+s;a+="var "+d+" = errors , "+g+" = false , "+h+" = false , "+y+" = null; ";var P=e.compositeRule;e.compositeRule=f.compositeRule=!0;var E=i;if(E)for(var w,S=-1,b=E.length-1;S<b;)w=E[S+=1],e.util.schemaHasRules(w,e.RULES.all)?(f.schema=w,f.schemaPath=n+"["+S+"]",f.errSchemaPath=l+"/"+S,a+="  "+e.validate(f)+" ",f.baseId=v):a+=" var "+m+" = true; ",S&&(a+=" if ("+m+" && "+g+") { "+h+" = false; "+y+" = ["+y+", "+S+"]; } else { ",p+="}"),a+=" if ("+m+") { "+h+" = "+g+" = true; "+y+" = "+S+"; }";return e.compositeRule=f.compositeRule=P,a+=p+"if (!"+h+") {   var err =   ",!1!==e.createErrors?(a+=" { keyword: 'oneOf' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { passingSchemas: "+y+" } ",!1!==e.opts.messages&&(a+=" , message: 'should match exactly one schema in oneOf' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",!e.compositeRule&&u&&(a+=e.async?" throw new ValidationError(vErrors); ":" validate.errors = vErrors; return false; "),a+="} else {  errors = "+d+"; if (vErrors !== null) { if ("+d+") vErrors.length = "+d+"; else vErrors = null; }",e.opts.allErrors&&(a+=" } "),a}},{}],31:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n;var f=d?"(new RegExp("+a+"))":e.usePattern(n);s+="if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'string') || ");var p=p||[];p.push(s+=" !"+f+".test("+h+") ) {   "),s="",!1!==e.createErrors?(s+=" { keyword: 'pattern' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { pattern:  ",s+=d?""+a:""+e.util.toQuotedString(n),s+="  } ",!1!==e.opts.messages&&(s+=" , message: 'should match pattern \"",s+=d?"' + "+a+" + '":""+e.util.escapeQuotes(n),s+="\"' "),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+e.util.toQuotedString(n),s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var m=s;return s=p.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+="} ",c&&(s+=" else { "),s}},{}],32:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="errs__"+s,d=e.util.copy(e),f="";d.level++;var p="valid"+d.level,m="key"+s,v="idx"+s,g=d.dataLevel=e.dataLevel+1,y="data"+g,P="dataProperties"+s,E=Object.keys(i||{}),w=e.schema.patternProperties||{},S=Object.keys(w),b=e.schema.additionalProperties,_=E.length||S.length,F=!1===b,x="object"==typeof b&&Object.keys(b).length,R=e.opts.removeAdditional,$=F||x||R,D=e.opts.ownProperties,j=e.baseId,I=e.schema.required;if(I&&(!e.opts.$data||!I.$data)&&I.length<e.opts.loopRequired)var O=e.util.toHash(I);if(a+="var "+h+" = errors;var "+p+" = true;",D&&(a+=" var "+P+" = undefined;"),$){if(a+=D?" "+P+" = "+P+" || Object.keys("+c+"); for (var "+v+"=0; "+v+"<"+P+".length; "+v+"++) { var "+m+" = "+P+"["+v+"]; ":" for (var "+m+" in "+c+") { ",_){if(a+=" var isAdditional"+s+" = !(false ",E.length)if(8<E.length)a+=" || validate.schema"+n+".hasOwnProperty("+m+") ";else{var A=E;if(A)for(var C=-1,k=A.length-1;C<k;)J=A[C+=1],a+=" || "+m+" == "+e.util.toQuotedString(J)+" "}if(S.length){var L=S;if(L)for(var z=-1,T=L.length-1;z<T;)ae=L[z+=1],a+=" || "+e.usePattern(ae)+".test("+m+") "}a+=" ); if (isAdditional"+s+") { "}if("all"==R)a+=" delete "+c+"["+m+"]; ";else{var N=e.errorPath,q="' + "+m+" + '";if(e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPathExpr(e.errorPath,m,e.opts.jsonPointers)),F)if(R)a+=" delete "+c+"["+m+"]; ";else{var U=l;l=e.errSchemaPath+"/additionalProperties",(ee=ee||[]).push(a+=" "+p+" = false; "),a="",!1!==e.createErrors?(a+=" { keyword: 'additionalProperties' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { additionalProperty: '"+q+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is an invalid additional property":"should NOT have additional properties",a+="' "),e.opts.verbose&&(a+=" , schema: false , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var Q=a;a=ee.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+Q+"]); ":" validate.errors = ["+Q+"]; return false; ":" var err = "+Q+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",l=U,u&&(a+=" break; ")}else if(x)if("failing"==R){a+=" var "+h+" = errors;  ";var V=e.compositeRule;e.compositeRule=d.compositeRule=!0,d.schema=b,d.schemaPath=e.schemaPath+".additionalProperties",d.errSchemaPath=e.errSchemaPath+"/additionalProperties",d.errorPath=e.opts._errorDataPathProperty?e.errorPath:e.util.getPathExpr(e.errorPath,m,e.opts.jsonPointers);var H=c+"["+m+"]";d.dataPathArr[g]=m;var M=e.validate(d);d.baseId=j,e.util.varOccurences(M,y)<2?a+=" "+e.util.varReplace(M,y,H)+" ":a+=" var "+y+" = "+H+"; "+M+" ",a+=" if (!"+p+") { errors = "+h+"; if (validate.errors !== null) { if (errors) validate.errors.length = errors; else validate.errors = null; } delete "+c+"["+m+"]; }  ",e.compositeRule=d.compositeRule=V}else{d.schema=b,d.schemaPath=e.schemaPath+".additionalProperties",d.errSchemaPath=e.errSchemaPath+"/additionalProperties",d.errorPath=e.opts._errorDataPathProperty?e.errorPath:e.util.getPathExpr(e.errorPath,m,e.opts.jsonPointers);H=c+"["+m+"]";d.dataPathArr[g]=m;M=e.validate(d);d.baseId=j,e.util.varOccurences(M,y)<2?a+=" "+e.util.varReplace(M,y,H)+" ":a+=" var "+y+" = "+H+"; "+M+" ",u&&(a+=" if (!"+p+") break; ")}e.errorPath=N}_&&(a+=" } "),a+=" }  ",u&&(a+=" if ("+p+") { ",f+="}")}var B=e.opts.useDefaults&&!e.compositeRule;if(E.length){var K=E;if(K)for(var J,Z=-1,G=K.length-1;Z<G;){if(J=K[Z+=1],e.util.schemaHasRules(ie=i[J],e.RULES.all)){var Y=e.util.getProperty(J),W=(H=c+Y,B&&void 0!==ie.default);d.schema=ie,d.schemaPath=n+Y,d.errSchemaPath=l+"/"+e.util.escapeFragment(J),d.errorPath=e.util.getPath(e.errorPath,J,e.opts.jsonPointers),d.dataPathArr[g]=e.util.toQuotedString(J);M=e.validate(d);if(d.baseId=j,e.util.varOccurences(M,y)<2){M=e.util.varReplace(M,y,H);var X=H}else{X=y;a+=" var "+y+" = "+H+"; "}if(W)a+=" "+M+" ";else{if(O&&O[J]){a+=" if ( "+X+" === undefined ",D&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(J)+"') "),a+=") { "+p+" = false; ";N=e.errorPath,U=l;var ee,re=e.util.escapeQuotes(J);e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPath(N,J,e.opts.jsonPointers)),l=e.errSchemaPath+"/required",(ee=ee||[]).push(a),a="",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+re+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+re+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";Q=a;a=ee.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+Q+"]); ":" validate.errors = ["+Q+"]; return false; ":" var err = "+Q+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",l=U,e.errorPath=N,a+=" } else { "}else u?(a+=" if ( "+X+" === undefined ",D&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(J)+"') "),a+=") { "+p+" = true; } else { "):(a+=" if ("+X+" !== undefined ",D&&(a+=" &&   Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(J)+"') "),a+=" ) { ");a+=" "+M+" } "}}u&&(a+=" if ("+p+") { ",f+="}")}}if(S.length){var te=S;if(te)for(var ae,se=-1,oe=te.length-1;se<oe;){var ie;if(ae=te[se+=1],e.util.schemaHasRules(ie=w[ae],e.RULES.all)){d.schema=ie,d.schemaPath=e.schemaPath+".patternProperties"+e.util.getProperty(ae),d.errSchemaPath=e.errSchemaPath+"/patternProperties/"+e.util.escapeFragment(ae),a+=D?" "+P+" = "+P+" || Object.keys("+c+"); for (var "+v+"=0; "+v+"<"+P+".length; "+v+"++) { var "+m+" = "+P+"["+v+"]; ":" for (var "+m+" in "+c+") { ",a+=" if ("+e.usePattern(ae)+".test("+m+")) { ",d.errorPath=e.util.getPathExpr(e.errorPath,m,e.opts.jsonPointers);H=c+"["+m+"]";d.dataPathArr[g]=m;M=e.validate(d);d.baseId=j,e.util.varOccurences(M,y)<2?a+=" "+e.util.varReplace(M,y,H)+" ":a+=" var "+y+" = "+H+"; "+M+" ",u&&(a+=" if (!"+p+") break; "),a+=" } ",u&&(a+=" else "+p+" = true; "),a+=" }  ",u&&(a+=" if ("+p+") { ",f+="}")}}}return u&&(a+=" "+f+" if ("+h+" == errors) {"),a=e.util.cleanUpCode(a)}},{}],33:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="errs__"+s,d=e.util.copy(e);d.level++;var f="valid"+d.level;if(e.util.schemaHasRules(i,e.RULES.all)){d.schema=i,d.schemaPath=n,d.errSchemaPath=l;var p="key"+s,m="idx"+s,v="i"+s,g="' + "+p+" + '",y="data"+(d.dataLevel=e.dataLevel+1),P="dataProperties"+s,E=e.opts.ownProperties,w=e.baseId;a+=" var "+h+" = errors; ",E&&(a+=" var "+P+" = undefined; "),a+=E?" "+P+" = "+P+" || Object.keys("+c+"); for (var "+m+"=0; "+m+"<"+P+".length; "+m+"++) { var "+p+" = "+P+"["+m+"]; ":" for (var "+p+" in "+c+") { ",a+=" var startErrs"+s+" = errors; ";var S=p,b=e.compositeRule;e.compositeRule=d.compositeRule=!0;var _=e.validate(d);d.baseId=w,e.util.varOccurences(_,y)<2?a+=" "+e.util.varReplace(_,y,S)+" ":a+=" var "+y+" = "+S+"; "+_+" ",e.compositeRule=d.compositeRule=b,a+=" if (!"+f+") { for (var "+v+"=startErrs"+s+"; "+v+"<errors; "+v+"++) { vErrors["+v+"].propertyName = "+p+"; }   var err =   ",!1!==e.createErrors?(a+=" { keyword: 'propertyNames' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { propertyName: '"+g+"' } ",!1!==e.opts.messages&&(a+=" , message: 'property name \\'"+g+"\\' is invalid' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",!e.compositeRule&&u&&(a+=e.async?" throw new ValidationError(vErrors); ":" validate.errors = vErrors; return false; "),u&&(a+=" break; "),a+=" } }"}return u&&(a+="  if ("+h+" == errors) {"),a=e.util.cleanUpCode(a)}},{}],34:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s,o=" ",i=e.dataLevel,n=e.schema[r],l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(i||""),h="valid"+e.level;if("#"==n||"#/"==n)e.isRoot?(a=e.async,s="validate"):(a=!0===e.root.schema.$async,s="root.refVal[0]");else{var d=e.resolveRef(e.baseId,n,e.isRoot);if(void 0===d){var f=e.MissingRefError.message(e.baseId,n);if("fail"==e.opts.missingRefs){e.logger.error(f),(g=g||[]).push(o),o="",!1!==e.createErrors?(o+=" { keyword: '$ref' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { ref: '"+e.util.escapeQuotes(n)+"' } ",!1!==e.opts.messages&&(o+=" , message: 'can\\'t resolve reference "+e.util.escapeQuotes(n)+"' "),e.opts.verbose&&(o+=" , schema: "+e.util.toQuotedString(n)+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),o+=" } "):o+=" {} ";var p=o;o=g.pop(),o+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+p+"]); ":" validate.errors = ["+p+"]; return false; ":" var err = "+p+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",u&&(o+=" if (false) { ")}else{if("ignore"!=e.opts.missingRefs)throw new e.MissingRefError(e.baseId,n,f);e.logger.warn(f),u&&(o+=" if (true) { ")}}else if(d.inline){var m=e.util.copy(e);m.level++;var v="valid"+m.level;m.schema=d.schema,m.schemaPath="",m.errSchemaPath=n,o+=" "+e.validate(m).replace(/validate\.schema/g,d.code)+" ",u&&(o+=" if ("+v+") { ")}else a=!0===d.$async||e.async&&!1!==d.$async,s=d.code}if(s){var g;(g=g||[]).push(o),o="",o+=e.opts.passContext?" "+s+".call(this, ":" "+s+"( ",o+=" "+c+", (dataPath || '')",'""'!=e.errorPath&&(o+=" + "+e.errorPath);var y=o+=" , "+(i?"data"+(i-1||""):"parentData")+" , "+(i?e.dataPathArr[i]:"parentDataProperty")+", rootData)  ";if(o=g.pop(),a){if(!e.async)throw new Error("async schema referenced by sync schema");u&&(o+=" var "+h+"; "),o+=" try { await "+y+"; ",u&&(o+=" "+h+" = true; "),o+=" } catch (e) { if (!(e instanceof ValidationError)) throw e; if (vErrors === null) vErrors = e.errors; else vErrors = vErrors.concat(e.errors); errors = vErrors.length; ",u&&(o+=" "+h+" = false; "),o+=" } ",u&&(o+=" if ("+h+") { ")}else o+=" if (!"+y+") { if (vErrors === null) vErrors = "+s+".errors; else vErrors = vErrors.concat("+s+".errors); errors = vErrors.length; } ",u&&(o+=" else { ")}return o}},{}],35:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d=e.opts.$data&&i&&i.$data;d&&(a+=" var schema"+s+" = "+e.util.getData(i.$data,o,e.dataPathArr)+"; ");var f="schema"+s;if(!d)if(i.length<e.opts.loopRequired&&e.schema.properties&&Object.keys(e.schema.properties).length){var p=[],m=i;if(m)for(var v,g=-1,y=m.length-1;g<y;){v=m[g+=1];var P=e.schema.properties[v];P&&e.util.schemaHasRules(P,e.RULES.all)||(p[p.length]=v)}}else p=i;if(d||p.length){var E=e.errorPath,w=d||e.opts.loopRequired<=p.length,S=e.opts.ownProperties;if(u)if(a+=" var missing"+s+"; ",w){d||(a+=" var "+f+" = validate.schema"+n+"; ");var b="' + "+(D="schema"+s+"["+(x="i"+s)+"]")+" + '";e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPathExpr(E,D,e.opts.jsonPointers)),a+=" var "+h+" = true; ",d&&(a+=" if (schema"+s+" === undefined) "+h+" = true; else if (!Array.isArray(schema"+s+")) "+h+" = false; else {"),a+=" for (var "+x+" = 0; "+x+" < "+f+".length; "+x+"++) { "+h+" = "+c+"["+f+"["+x+"]] !== undefined ",S&&(a+=" &&   Object.prototype.hasOwnProperty.call("+c+", "+f+"["+x+"]) "),a+="; if (!"+h+") break; } ",d&&(a+="  }  "),($=$||[]).push(a+="  if (!"+h+") {   "),a="",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+b+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+b+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var _=a;a=$.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+_+"]); ":" validate.errors = ["+_+"]; return false; ":" var err = "+_+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } else { "}else{a+=" if ( ";var F=p;if(F)for(var x=-1,R=F.length-1;x<R;){I=F[x+=1],x&&(a+=" || "),a+=" ( ( "+(k=c+(C=e.util.getProperty(I)))+" === undefined ",S&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(I)+"') "),a+=") && (missing"+s+" = "+e.util.toQuotedString(e.opts.jsonPointers?I:C)+") ) "}a+=") {  ";var $;b="' + "+(D="missing"+s)+" + '";e.opts._errorDataPathProperty&&(e.errorPath=e.opts.jsonPointers?e.util.getPathExpr(E,D,!0):E+" + "+D),($=$||[]).push(a),a="",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+b+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+b+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";_=a;a=$.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+_+"]); ":" validate.errors = ["+_+"]; return false; ":" var err = "+_+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } else { "}else if(w){d||(a+=" var "+f+" = validate.schema"+n+"; ");var D;b="' + "+(D="schema"+s+"["+(x="i"+s)+"]")+" + '";e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPathExpr(E,D,e.opts.jsonPointers)),d&&(a+=" if ("+f+" && !Array.isArray("+f+")) {  var err =   ",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+b+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+b+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } else if ("+f+" !== undefined) { "),a+=" for (var "+x+" = 0; "+x+" < "+f+".length; "+x+"++) { if ("+c+"["+f+"["+x+"]] === undefined ",S&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", "+f+"["+x+"]) "),a+=") {  var err =   ",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+b+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+b+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } } ",d&&(a+="  }  ")}else{var j=p;if(j)for(var I,O=-1,A=j.length-1;O<A;){I=j[O+=1];var C=e.util.getProperty(I),k=(b=e.util.escapeQuotes(I),c+C);e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPath(E,I,e.opts.jsonPointers)),a+=" if ( "+k+" === undefined ",S&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(I)+"') "),a+=") {  var err =   ",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+b+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+b+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } "}}e.errorPath=E}else u&&(a+=" if (true) {");return a}},{}],36:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d="valid"+o,f=e.opts.$data&&n&&n.$data;if(f?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n,(n||f)&&!1!==e.opts.uniqueItems){f&&(s+=" var "+d+"; if ("+a+" === false || "+a+" === undefined) "+d+" = true; else if (typeof "+a+" != 'boolean') "+d+" = false; else { "),s+=" var i = "+h+".length , "+d+" = true , j; if (i > 1) { ";var p=e.schema.items&&e.schema.items.type,m=Array.isArray(p);if(!p||"object"==p||"array"==p||m&&(0<=p.indexOf("object")||0<=p.indexOf("array")))s+=" outer: for (;i--;) { for (j = i; j--;) { if (equal("+h+"[i], "+h+"[j])) { "+d+" = false; break outer; } } } ";else s+=" var itemIndices = {}, item; for (;i--;) { var item = "+h+"[i]; ",s+=" if ("+e.util["checkDataType"+(m?"s":"")](p,"item",!0)+") continue; ",m&&(s+=" if (typeof item == 'string') item = '\"' + item; "),s+=" if (typeof itemIndices[item] == 'number') { "+d+" = false; j = itemIndices[item]; break; } itemIndices[item] = i; } ";s+=" } ",f&&(s+="  }  ");var v=v||[];v.push(s+=" if (!"+d+") {   "),s="",!1!==e.createErrors?(s+=" { keyword: 'uniqueItems' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { i: i, j: j } ",!1!==e.opts.messages&&(s+=" , message: 'should NOT have duplicate items (items ## ' + j + ' and ' + i + ' are identical)' "),e.opts.verbose&&(s+=" , schema:  ",s+=f?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var g=s;s=v.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+g+"]); ":" validate.errors = ["+g+"]; return false; ":" var err = "+g+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+=" } ",c&&(s+=" else { ")}else c&&(s+=" if (true) { ");return s}},{}],37:[function(e,r,t){"use strict";r.exports=function(a,e,r){var t="",s=!0===a.schema.$async,o=a.util.schemaHasRulesExcept(a.schema,a.RULES.all,"$ref"),i=a.self._getId(a.schema);if(a.isTop&&(t+=" var validate = ",s&&(a.async=!0,t+="async "),t+="function(data, dataPath, parentData, parentDataProperty, rootData) { 'use strict'; ",i&&(a.opts.sourceCode||a.opts.processCode)&&(t+=" /*# sourceURL="+i+" */ ")),"boolean"==typeof a.schema||!o&&!a.schema.$ref){var n=a.level,l=a.dataLevel,u=a.schema[e="false schema"],c=a.schemaPath+a.util.getProperty(e),h=a.errSchemaPath+"/"+e,d=!a.opts.allErrors,f="data"+(l||""),p="valid"+n;if(!1===a.schema){a.isTop?d=!0:t+=" var "+p+" = false; ",(K=K||[]).push(t),t="",!1!==a.createErrors?(t+=" { keyword: 'false schema' , dataPath: (dataPath || '') + "+a.errorPath+" , schemaPath: "+a.util.toQuotedString(h)+" , params: {} ",!1!==a.opts.messages&&(t+=" , message: 'boolean schema is false' "),a.opts.verbose&&(t+=" , schema: false , parentSchema: validate.schema"+a.schemaPath+" , data: "+f+" "),t+=" } "):t+=" {} ";var m=t;t=K.pop(),t+=!a.compositeRule&&d?a.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; "}else t+=a.isTop?s?" return data; ":" validate.errors = null; return true; ":" var "+p+" = true; ";return a.isTop&&(t+=" }; return validate; "),t}if(a.isTop){var v=a.isTop;n=a.level=0,l=a.dataLevel=0,f="data";a.rootId=a.resolve.fullPath(a.self._getId(a.root.schema)),a.baseId=a.baseId||a.rootId,delete a.isTop,a.dataPathArr=[void 0],t+=" var vErrors = null; ",t+=" var errors = 0;     ",t+=" if (rootData === undefined) rootData = data; "}else{n=a.level,f="data"+((l=a.dataLevel)||"");if(i&&(a.baseId=a.resolve.url(a.baseId,i)),s&&!a.async)throw new Error("async schema in sync schema");t+=" var errs_"+n+" = errors;"}p="valid"+n,d=!a.opts.allErrors;var g="",y="",P=a.schema.type,E=Array.isArray(P);if(E&&1==P.length&&(P=P[0],E=!1),a.schema.$ref&&o){if("fail"==a.opts.extendRefs)throw new Error('$ref: validation keywords used in schema at path "'+a.errSchemaPath+'" (see option extendRefs)');!0!==a.opts.extendRefs&&(o=!1,a.logger.warn('$ref: keywords ignored in schema at path "'+a.errSchemaPath+'"'))}if(a.schema.$comment&&a.opts.$comment&&(t+=" "+a.RULES.all.$comment.code(a,"$comment")),P){if(a.opts.coerceTypes)var w=a.util.coerceToTypes(a.opts.coerceTypes,P);var S=a.RULES.types[P];if(w||E||!0===S||S&&!J(S)){c=a.schemaPath+".type",h=a.errSchemaPath+"/type",c=a.schemaPath+".type",h=a.errSchemaPath+"/type";if(t+=" if ("+a.util[E?"checkDataTypes":"checkDataType"](P,f,!0)+") { ",w){var b="dataType"+n,_="coerced"+n;t+=" var "+b+" = typeof "+f+"; ","array"==a.opts.coerceTypes&&(t+=" if ("+b+" == 'object' && Array.isArray("+f+")) "+b+" = 'array'; "),t+=" var "+_+" = undefined; ";var F="",x=w;if(x)for(var R,$=-1,D=x.length-1;$<D;)R=x[$+=1],$&&(t+=" if ("+_+" === undefined) { ",F+="}"),"array"==a.opts.coerceTypes&&"array"!=R&&(t+=" if ("+b+" == 'array' && "+f+".length == 1) { "+_+" = "+f+" = "+f+"[0]; "+b+" = typeof "+f+";  } "),"string"==R?t+=" if ("+b+" == 'number' || "+b+" == 'boolean') "+_+" = '' + "+f+"; else if ("+f+" === null) "+_+" = ''; ":"number"==R||"integer"==R?(t+=" if ("+b+" == 'boolean' || "+f+" === null || ("+b+" == 'string' && "+f+" && "+f+" == +"+f+" ","integer"==R&&(t+=" && !("+f+" % 1)"),t+=")) "+_+" = +"+f+"; "):"boolean"==R?t+=" if ("+f+" === 'false' || "+f+" === 0 || "+f+" === null) "+_+" = false; else if ("+f+" === 'true' || "+f+" === 1) "+_+" = true; ":"null"==R?t+=" if ("+f+" === '' || "+f+" === 0 || "+f+" === false) "+_+" = null; ":"array"==a.opts.coerceTypes&&"array"==R&&(t+=" if ("+b+" == 'string' || "+b+" == 'number' || "+b+" == 'boolean' || "+f+" == null) "+_+" = ["+f+"]; ");(K=K||[]).push(t+=" "+F+" if ("+_+" === undefined) {   "),t="",!1!==a.createErrors?(t+=" { keyword: 'type' , dataPath: (dataPath || '') + "+a.errorPath+" , schemaPath: "+a.util.toQuotedString(h)+" , params: { type: '",t+=E?""+P.join(","):""+P,t+="' } ",!1!==a.opts.messages&&(t+=" , message: 'should be ",t+=E?""+P.join(","):""+P,t+="' "),a.opts.verbose&&(t+=" , schema: validate.schema"+c+" , parentSchema: validate.schema"+a.schemaPath+" , data: "+f+" "),t+=" } "):t+=" {} ";m=t;t=K.pop(),t+=!a.compositeRule&&d?a.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",t+=" } else {  ";var j=l?"data"+(l-1||""):"parentData";t+=" "+f+" = "+_+"; ",l||(t+="if ("+j+" !== undefined)"),t+=" "+j+"["+(l?a.dataPathArr[l]:"parentDataProperty")+"] = "+_+"; } "}else{(K=K||[]).push(t),t="",!1!==a.createErrors?(t+=" { keyword: 'type' , dataPath: (dataPath || '') + "+a.errorPath+" , schemaPath: "+a.util.toQuotedString(h)+" , params: { type: '",t+=E?""+P.join(","):""+P,t+="' } ",!1!==a.opts.messages&&(t+=" , message: 'should be ",t+=E?""+P.join(","):""+P,t+="' "),a.opts.verbose&&(t+=" , schema: validate.schema"+c+" , parentSchema: validate.schema"+a.schemaPath+" , data: "+f+" "),t+=" } "):t+=" {} ";m=t;t=K.pop(),t+=!a.compositeRule&&d?a.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; "}t+=" } "}}if(a.schema.$ref&&!o)t+=" "+a.RULES.all.$ref.code(a,"$ref")+" ",d&&(t+=" } if (errors === ",t+=v?"0":"errs_"+n,t+=") { ",y+="}");else{var I=a.RULES;if(I)for(var O=-1,A=I.length-1;O<A;)if(J(S=I[O+=1])){if(S.type&&(t+=" if ("+a.util.checkDataType(S.type,f)+") { "),a.opts.useDefaults&&!a.compositeRule)if("object"==S.type&&a.schema.properties){u=a.schema.properties;var C=Object.keys(u);if(C)for(var k,L=-1,z=C.length-1;L<z;){if(void 0!==(N=u[k=C[L+=1]]).default)t+="  if ("+(U=f+a.util.getProperty(k))+" === undefined) "+U+" = ",t+="shared"==a.opts.useDefaults?" "+a.useDefault(N.default)+" ":" "+JSON.stringify(N.default)+" ",t+="; "}}else if("array"==S.type&&Array.isArray(a.schema.items)){var T=a.schema.items;if(T){$=-1;for(var N,q=T.length-1;$<q;){var U;if(void 0!==(N=T[$+=1]).default)t+="  if ("+(U=f+"["+$+"]")+" === undefined) "+U+" = ",t+="shared"==a.opts.useDefaults?" "+a.useDefault(N.default)+" ":" "+JSON.stringify(N.default)+" ",t+="; "}}}var Q=S.rules;if(Q)for(var V,H=-1,M=Q.length-1;H<M;)if(Z(V=Q[H+=1])){var B=V.code(a,V.keyword,S.type);B&&(t+=" "+B+" ",d&&(g+="}"))}if(d&&(t+=" "+g+" ",g=""),S.type&&(t+=" } ",P&&P===S.type&&!w)){var K;c=a.schemaPath+".type",h=a.errSchemaPath+"/type";(K=K||[]).push(t+=" else { "),t="",!1!==a.createErrors?(t+=" { keyword: 'type' , dataPath: (dataPath || '') + "+a.errorPath+" , schemaPath: "+a.util.toQuotedString(h)+" , params: { type: '",t+=E?""+P.join(","):""+P,t+="' } ",!1!==a.opts.messages&&(t+=" , message: 'should be ",t+=E?""+P.join(","):""+P,t+="' "),a.opts.verbose&&(t+=" , schema: validate.schema"+c+" , parentSchema: validate.schema"+a.schemaPath+" , data: "+f+" "),t+=" } "):t+=" {} ";m=t;t=K.pop(),t+=!a.compositeRule&&d?a.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",t+=" } "}d&&(t+=" if (errors === ",t+=v?"0":"errs_"+n,t+=") { ",y+="}")}}function J(e){for(var r=e.rules,t=0;t<r.length;t++)if(Z(r[t]))return!0}function Z(e){return void 0!==a.schema[e.keyword]||e.implements&&function(e){for(var r=e.implements,t=0;t<r.length;t++)if(void 0!==a.schema[r[t]])return!0}(e)}return d&&(t+=" "+y+" "),v?(s?(t+=" if (errors === 0) return data;           ",t+=" else throw new ValidationError(vErrors); "):(t+=" validate.errors = vErrors; ",t+=" return errors === 0;       "),t+=" }; return validate;"):t+=" var "+p+" = errors === errs_"+n+";",t=a.util.cleanUpCode(t),v&&(t=a.util.finalCleanUpCode(t,s)),t}},{}],38:[function(e,r,t){"use strict";var c=/^[a-z_$][a-z0-9_$-]*$/i,h=e("./dotjs/custom");r.exports={add:function(e,r){var n=this.RULES;if(n.keywords[e])throw new Error("Keyword "+e+" is already defined");if(!c.test(e))throw new Error("Keyword "+e+" is not a valid identifier");if(r){if(r.macro&&void 0!==r.valid)throw new Error('"valid" option cannot be used with macro keywords');var t=r.type;if(Array.isArray(t)){var a,s=t.length;for(a=0;a<s;a++)u(t[a]);for(a=0;a<s;a++)l(e,t[a],r)}else t&&u(t),l(e,t,r);var o=!0===r.$data&&this._opts.$data;if(o&&!r.validate)throw new Error('$data support: "validate" function is not defined');var i=r.metaSchema;i&&(o&&(i={anyOf:[i,{$ref:"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#"}]}),r.validateSchema=this.compile(i,!0))}function l(e,r,t){for(var a,s=0;s<n.length;s++){var o=n[s];if(o.type==r){a=o;break}}a||n.push(a={type:r,rules:[]});var i={keyword:e,definition:t,custom:!0,code:h,implements:t.implements};a.rules.push(i),n.custom[e]=i}function u(e){if(!n.types[e])throw new Error("Unknown type "+e)}return n.keywords[e]=n.all[e]=!0,this},get:function(e){var r=this.RULES.custom[e];return r?r.definition:this.RULES.keywords[e]||!1},remove:function(e){var r=this.RULES;delete r.keywords[e],delete r.all[e],delete r.custom[e];for(var t=0;t<r.length;t++)for(var a=r[t].rules,s=0;s<a.length;s++)if(a[s].keyword==e){a.splice(s,1);break}return this}}},{"./dotjs/custom":21}],39:[function(e,r,t){r.exports={$schema:"http://json-schema.org/draft-07/schema#",$id:"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#",description:"Meta-schema for $data reference (JSON Schema extension proposal)",type:"object",required:["$data"],properties:{$data:{type:"string",anyOf:[{format:"relative-json-pointer"},{format:"json-pointer"}]}},additionalProperties:!1}},{}],40:[function(e,r,t){r.exports={$schema:"http://json-schema.org/draft-07/schema#",$id:"http://json-schema.org/draft-07/schema#",title:"Core schema meta-schema",definitions:{schemaArray:{type:"array",minItems:1,items:{$ref:"#"}},nonNegativeInteger:{type:"integer",minimum:0},nonNegativeIntegerDefault0:{allOf:[{$ref:"#/definitions/nonNegativeInteger"},{default:0}]},simpleTypes:{enum:["array","boolean","integer","null","number","object","string"]},stringArray:{type:"array",items:{type:"string"},uniqueItems:!0,default:[]}},type:["object","boolean"],properties:{$id:{type:"string",format:"uri-reference"},$schema:{type:"string",format:"uri"},$ref:{type:"string",format:"uri-reference"},$comment:{type:"string"},title:{type:"string"},description:{type:"string"},default:!0,readOnly:{type:"boolean",default:!1},examples:{type:"array",items:!0},multipleOf:{type:"number",exclusiveMinimum:0},maximum:{type:"number"},exclusiveMaximum:{type:"number"},minimum:{type:"number"},exclusiveMinimum:{type:"number"},maxLength:{$ref:"#/definitions/nonNegativeInteger"},minLength:{$ref:"#/definitions/nonNegativeIntegerDefault0"},pattern:{type:"string",format:"regex"},additionalItems:{$ref:"#"},items:{anyOf:[{$ref:"#"},{$ref:"#/definitions/schemaArray"}],default:!0},maxItems:{$ref:"#/definitions/nonNegativeInteger"},minItems:{$ref:"#/definitions/nonNegativeIntegerDefault0"},uniqueItems:{type:"boolean",default:!1},contains:{$ref:"#"},maxProperties:{$ref:"#/definitions/nonNegativeInteger"},minProperties:{$ref:"#/definitions/nonNegativeIntegerDefault0"},required:{$ref:"#/definitions/stringArray"},additionalProperties:{$ref:"#"},definitions:{type:"object",additionalProperties:{$ref:"#"},default:{}},properties:{type:"object",additionalProperties:{$ref:"#"},default:{}},patternProperties:{type:"object",additionalProperties:{$ref:"#"},propertyNames:{format:"regex"},default:{}},dependencies:{type:"object",additionalProperties:{anyOf:[{$ref:"#"},{$ref:"#/definitions/stringArray"}]}},propertyNames:{$ref:"#"},const:!0,enum:{type:"array",items:!0,minItems:1,uniqueItems:!0},type:{anyOf:[{$ref:"#/definitions/simpleTypes"},{type:"array",items:{$ref:"#/definitions/simpleTypes"},minItems:1,uniqueItems:!0}]},format:{type:"string"},contentMediaType:{type:"string"},contentEncoding:{type:"string"},if:{$ref:"#"},then:{$ref:"#"},else:{$ref:"#"},allOf:{$ref:"#/definitions/schemaArray"},anyOf:{$ref:"#/definitions/schemaArray"},oneOf:{$ref:"#/definitions/schemaArray"},not:{$ref:"#"}},default:!0}},{}],41:[function(e,r,t){"use strict";var f=Array.isArray,p=Object.keys,m=Object.prototype.hasOwnProperty;r.exports=function e(r,t){if(r===t)return!0;if(r&&t&&"object"==typeof r&&"object"==typeof t){var a,s,o,i=f(r),n=f(t);if(i&&n){if((s=r.length)!=t.length)return!1;for(a=s;0!=a--;)if(!e(r[a],t[a]))return!1;return!0}if(i!=n)return!1;var l=r instanceof Date,u=t instanceof Date;if(l!=u)return!1;if(l&&u)return r.getTime()==t.getTime();var c=r instanceof RegExp,h=t instanceof RegExp;if(c!=h)return!1;if(c&&h)return r.toString()==t.toString();var d=p(r);if((s=d.length)!==p(t).length)return!1;for(a=s;0!=a--;)if(!m.call(t,d[a]))return!1;for(a=s;0!=a--;)if(!e(r[o=d[a]],t[o]))return!1;return!0}return r!=r&&t!=t}},{}],42:[function(e,r,t){"use strict";r.exports=function(e,r){r||(r={}),"function"==typeof r&&(r={cmp:r});var a,l="boolean"==typeof r.cycles&&r.cycles,u=r.cmp&&(a=r.cmp,function(t){return function(e,r){return a({key:e,value:t[e]},{key:r,value:t[r]})}}),c=[];return function e(r){if(r&&r.toJSON&&"function"==typeof r.toJSON&&(r=r.toJSON()),void 0!==r){if("number"==typeof r)return isFinite(r)?""+r:"null";if("object"!=typeof r)return JSON.stringify(r);var t,a;if(Array.isArray(r)){for(a="[",t=0;t<r.length;t++)t&&(a+=","),a+=e(r[t])||"null";return a+"]"}if(null===r)return"null";if(-1!==c.indexOf(r)){if(l)return JSON.stringify("__cycle__");throw new TypeError("Converting circular structure to JSON")}var s=c.push(r)-1,o=Object.keys(r).sort(u&&u(r));for(a="",t=0;t<o.length;t++){var i=o[t],n=e(r[i]);n&&(a&&(a+=","),a+=JSON.stringify(i)+":"+n)}return c.splice(s,1),"{"+a+"}"}}(e)}},{}],43:[function(e,r,t){"use strict";var p=r.exports=function(e,r,t){"function"==typeof r&&(t=r,r={}),function e(r,t,a,s,o,i,n,l,u){if(a&&"object"==typeof a&&!Array.isArray(a))for(var c in t(a,s,o,i,n,l,u),a){var h=a[c];if(Array.isArray(h)){if(c in p.arrayKeywords)for(var d=0;d<h.length;d++)e(r,t,h[d],s+"/"+c+"/"+d,o,s,c,a,d)}else if(c in p.propsKeywords){if(h&&"object"==typeof h)for(var f in h)e(r,t,h[f],s+"/"+c+"/"+f.replace(/~/g,"~0").replace(/\//g,"~1"),o,s,c,a,f)}else(c in p.keywords||r.allKeys&&!(c in p.skipKeywords))&&e(r,t,h,s+"/"+c,o,s,c,a)}}(r,t,e,"",e)};p.keywords={additionalItems:!0,items:!0,contains:!0,additionalProperties:!0,propertyNames:!0,not:!0},p.arrayKeywords={items:!0,allOf:!0,anyOf:!0,oneOf:!0},p.propsKeywords={definitions:!0,properties:!0,patternProperties:!0,dependencies:!0},p.skipKeywords={enum:!0,const:!0,required:!0,maximum:!0,minimum:!0,exclusiveMaximum:!0,exclusiveMinimum:!0,multipleOf:!0,maxLength:!0,minLength:!0,pattern:!0,format:!0,maxItems:!0,minItems:!0,uniqueItems:!0,maxProperties:!0,minProperties:!0}},{}],44:[function(e,r,t){var a;a=this,function(e){"use strict";function C(){for(var e=arguments.length,r=Array(e),t=0;t<e;t++)r[t]=arguments[t];if(1<r.length){r[0]=r[0].slice(0,-1);for(var a=r.length-1,s=1;s<a;++s)r[s]=r[s].slice(1,-1);return r[a]=r[a].slice(1),r.join("")}return r[0]}function k(e){return"(?:"+e+")"}function a(e){return void 0===e?"undefined":null===e?"null":Object.prototype.toString.call(e).split(" ").pop().split("]").shift().toLowerCase()}function p(e){return e.toUpperCase()}function r(e){var r="[A-Za-z]",t="[0-9]",a=C(t,"[A-Fa-f]"),s=k(k("%[EFef]"+a+"%"+a+a+"%"+a+a)+"|"+k("%[89A-Fa-f]"+a+"%"+a+a)+"|"+k("%"+a+a)),o="[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]",i=C("[\\:\\/\\?\\#\\[\\]\\@]",o),n=e?"[\\uE000-\\uF8FF]":"[]",l=C(r,t,"[\\-\\.\\_\\~]",e?"[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]":"[]"),u=k(r+C(r,t,"[\\+\\-\\.]")+"*"),c=k(k(s+"|"+C(l,o,"[\\:]"))+"*"),h=(k(k("25[0-5]")+"|"+k("2[0-4]"+t)+"|"+k("1"+t+t)+"|"+k("[1-9]"+t)+"|"+t),k(k("25[0-5]")+"|"+k("2[0-4]"+t)+"|"+k("1"+t+t)+"|"+k("0?[1-9]"+t)+"|0?0?"+t)),d=k(h+"\\."+h+"\\."+h+"\\."+h),f=k(a+"{1,4}"),p=k(k(f+"\\:"+f)+"|"+d),m=k([k(k(f+"\\:")+"{6}"+p),k("\\:\\:"+k(f+"\\:")+"{5}"+p),k(k(f)+"?\\:\\:"+k(f+"\\:")+"{4}"+p),k(k(k(f+"\\:")+"{0,1}"+f)+"?\\:\\:"+k(f+"\\:")+"{3}"+p),k(k(k(f+"\\:")+"{0,2}"+f)+"?\\:\\:"+k(f+"\\:")+"{2}"+p),k(k(k(f+"\\:")+"{0,3}"+f)+"?\\:\\:"+f+"\\:"+p),k(k(k(f+"\\:")+"{0,4}"+f)+"?\\:\\:"+p),k(k(k(f+"\\:")+"{0,5}"+f)+"?\\:\\:"+f),k(k(k(f+"\\:")+"{0,6}"+f)+"?\\:\\:")].join("|")),v=k(k(l+"|"+s)+"+"),g=(k(m+"\\%25"+v),k("\\["+k(k(m+k("\\%25|\\%(?!"+a+"{2})")+v)+"|"+m+"|"+k("[vV]"+a+"+\\."+C(l,o,"[\\:]")+"+"))+"\\]")),y=k(k(s+"|"+C(l,o))+"*"),P=k(g+"|"+d+"(?!"+y+")|"+y),E=k(t+"*"),w=k(k(c+"@")+"?"+P+k("\\:"+E)+"?"),S=k(s+"|"+C(l,o,"[\\:\\@]")),b=k(S+"*"),_=k(S+"+"),F=k(k(s+"|"+C(l,o,"[\\@]"))+"+"),x=k(k("\\/"+b)+"*"),R=k("\\/"+k(_+x)+"?"),$=k(F+x),D=k(_+x),j="(?!"+S+")",I=(k(x+"|"+R+"|"+$+"|"+D+"|"+j),k(k(S+"|"+C("[\\/\\?]",n))+"*")),O=k(k(S+"|[\\/\\?]")+"*"),A=k(k("\\/\\/"+w+x)+"|"+R+"|"+D+"|"+j);k(k(u+"\\:"+A+k("\\?"+I)+"?"+k("\\#"+O)+"?")+"|"+k(k(k("\\/\\/"+w+x)+"|"+R+"|"+$+"|"+j)+k("\\?"+I)+"?"+k("\\#"+O)+"?")),k(u+"\\:"+A+k("\\?"+I)+"?"),k(k("\\/\\/("+k("("+c+")@")+"?("+P+")"+k("\\:("+E+")")+"?)")+"?("+x+"|"+R+"|"+D+"|"+j+")"),k("\\?("+I+")"),k("\\#("+O+")"),k(k("\\/\\/("+k("("+c+")@")+"?("+P+")"+k("\\:("+E+")")+"?)")+"?("+x+"|"+R+"|"+$+"|"+j+")"),k("\\?("+I+")"),k("\\#("+O+")"),k(k("\\/\\/("+k("("+c+")@")+"?("+P+")"+k("\\:("+E+")")+"?)")+"?("+x+"|"+R+"|"+D+"|"+j+")"),k("\\?("+I+")"),k("\\#("+O+")"),k("("+c+")@"),k("\\:("+E+")");return{NOT_SCHEME:new RegExp(C("[^]",r,t,"[\\+\\-\\.]"),"g"),NOT_USERINFO:new RegExp(C("[^\\%\\:]",l,o),"g"),NOT_HOST:new RegExp(C("[^\\%\\[\\]\\:]",l,o),"g"),NOT_PATH:new RegExp(C("[^\\%\\/\\:\\@]",l,o),"g"),NOT_PATH_NOSCHEME:new RegExp(C("[^\\%\\/\\@]",l,o),"g"),NOT_QUERY:new RegExp(C("[^\\%]",l,o,"[\\:\\@\\/\\?]",n),"g"),NOT_FRAGMENT:new RegExp(C("[^\\%]",l,o,"[\\:\\@\\/\\?]"),"g"),ESCAPE:new RegExp(C("[^]",l,o),"g"),UNRESERVED:new RegExp(l,"g"),OTHER_CHARS:new RegExp(C("[^\\%]",l,i),"g"),PCT_ENCODED:new RegExp(s,"g"),IPV4ADDRESS:new RegExp("^("+d+")$"),IPV6ADDRESS:new RegExp("^\\[?("+m+")"+k(k("\\%25|\\%(?!"+a+"{2})")+"("+v+")")+"?\\]?$")}}var c=r(!1),h=r(!0),w=function(e,r){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return function(e,r){var t=[],a=!0,s=!1,o=void 0;try{for(var i,n=e[Symbol.iterator]();!(a=(i=n.next()).done)&&(t.push(i.value),!r||t.length!==r);a=!0);}catch(e){s=!0,o=e}finally{try{!a&&n.return&&n.return()}finally{if(s)throw o}}return t}(e,r);throw new TypeError("Invalid attempt to destructure non-iterable instance")},A=2147483647,t=/^xn--/,s=/[^\0-\x7E]/,o=/[\x2E\u3002\uFF0E\uFF61]/g,i={overflow:"Overflow: input needs wider integers to process","not-basic":"Illegal input >= 0x80 (not a basic code point)","invalid-input":"Invalid input"},L=Math.floor,z=String.fromCharCode;function T(e){throw new RangeError(i[e])}function n(e,r){var t=e.split("@"),a="";return 1<t.length&&(a=t[0]+"@",e=t[1]),a+function(e,r){for(var t=[],a=e.length;a--;)t[a]=r(e[a]);return t}((e=e.replace(o,".")).split("."),r).join(".")}function N(e){for(var r=[],t=0,a=e.length;t<a;){var s=e.charCodeAt(t++);if(55296<=s&&s<=56319&&t<a){var o=e.charCodeAt(t++);56320==(64512&o)?r.push(((1023&s)<<10)+(1023&o)+65536):(r.push(s),t--)}else r.push(s)}return r}var q=function(e,r){return e+22+75*(e<26)-((0!=r)<<5)},U=function(e,r,t){var a=0;for(e=t?L(e/700):e>>1,e+=L(e/r);455<e;a+=36)e=L(e/35);return L(a+36*e/(e+38))},l=function(e){var r,t=[],a=e.length,s=0,o=128,i=72,n=e.lastIndexOf("-");n<0&&(n=0);for(var l=0;l<n;++l)128<=e.charCodeAt(l)&&T("not-basic"),t.push(e.charCodeAt(l));for(var u=0<n?n+1:0;u<a;){for(var c=s,h=1,d=36;;d+=36){a<=u&&T("invalid-input");var f=(r=e.charCodeAt(u++))-48<10?r-22:r-65<26?r-65:r-97<26?r-97:36;(36<=f||f>L((A-s)/h))&&T("overflow"),s+=f*h;var p=d<=i?1:i+26<=d?26:d-i;if(f<p)break;var m=36-p;h>L(A/m)&&T("overflow"),h*=m}var v=t.length+1;i=U(s-c,v,0==c),L(s/v)>A-o&&T("overflow"),o+=L(s/v),s%=v,t.splice(s++,0,o)}return String.fromCodePoint.apply(String,t)},u=function(e){var r=[],t=(e=N(e)).length,a=128,s=0,o=72,i=!0,n=!1,l=void 0;try{for(var u,c=e[Symbol.iterator]();!(i=(u=c.next()).done);i=!0){var h=u.value;h<128&&r.push(z(h))}}catch(e){n=!0,l=e}finally{try{!i&&c.return&&c.return()}finally{if(n)throw l}}var d=r.length,f=d;for(d&&r.push("-");f<t;){var p=A,m=!0,v=!1,g=void 0;try{for(var y,P=e[Symbol.iterator]();!(m=(y=P.next()).done);m=!0){var E=y.value;a<=E&&E<p&&(p=E)}}catch(e){v=!0,g=e}finally{try{!m&&P.return&&P.return()}finally{if(v)throw g}}var w=f+1;p-a>L((A-s)/w)&&T("overflow"),s+=(p-a)*w,a=p;var S=!0,b=!1,_=void 0;try{for(var F,x=e[Symbol.iterator]();!(S=(F=x.next()).done);S=!0){var R=F.value;if(R<a&&++s>A&&T("overflow"),R==a){for(var $=s,D=36;;D+=36){var j=D<=o?1:o+26<=D?26:D-o;if($<j)break;var I=$-j,O=36-j;r.push(z(q(j+I%O,0))),$=L(I/O)}r.push(z(q($,0))),o=U(s,w,f==d),s=0,++f}}}catch(e){b=!0,_=e}finally{try{!S&&x.return&&x.return()}finally{if(b)throw _}}++s,++a}return r.join("")},v={version:"2.1.0",ucs2:{decode:N,encode:function(e){return String.fromCodePoint.apply(String,function(e){if(Array.isArray(e)){for(var r=0,t=Array(e.length);r<e.length;r++)t[r]=e[r];return t}return Array.from(e)}(e))}},decode:l,encode:u,toASCII:function(e){return n(e,function(e){return s.test(e)?"xn--"+u(e):e})},toUnicode:function(e){return n(e,function(e){return t.test(e)?l(e.slice(4).toLowerCase()):e})}},d={};function m(e){var r=e.charCodeAt(0);return r<16?"%0"+r.toString(16).toUpperCase():r<128?"%"+r.toString(16).toUpperCase():r<2048?"%"+(r>>6|192).toString(16).toUpperCase()+"%"+(63&r|128).toString(16).toUpperCase():"%"+(r>>12|224).toString(16).toUpperCase()+"%"+(r>>6&63|128).toString(16).toUpperCase()+"%"+(63&r|128).toString(16).toUpperCase()}function f(e){for(var r="",t=0,a=e.length;t<a;){var s=parseInt(e.substr(t+1,2),16);if(s<128)r+=String.fromCharCode(s),t+=3;else if(194<=s&&s<224){if(6<=a-t){var o=parseInt(e.substr(t+4,2),16);r+=String.fromCharCode((31&s)<<6|63&o)}else r+=e.substr(t,6);t+=6}else if(224<=s){if(9<=a-t){var i=parseInt(e.substr(t+4,2),16),n=parseInt(e.substr(t+7,2),16);r+=String.fromCharCode((15&s)<<12|(63&i)<<6|63&n)}else r+=e.substr(t,9);t+=9}else r+=e.substr(t,3),t+=3}return r}function g(e,t){function r(e){var r=f(e);return r.match(t.UNRESERVED)?r:e}return e.scheme&&(e.scheme=String(e.scheme).replace(t.PCT_ENCODED,r).toLowerCase().replace(t.NOT_SCHEME,"")),void 0!==e.userinfo&&(e.userinfo=String(e.userinfo).replace(t.PCT_ENCODED,r).replace(t.NOT_USERINFO,m).replace(t.PCT_ENCODED,p)),void 0!==e.host&&(e.host=String(e.host).replace(t.PCT_ENCODED,r).toLowerCase().replace(t.NOT_HOST,m).replace(t.PCT_ENCODED,p)),void 0!==e.path&&(e.path=String(e.path).replace(t.PCT_ENCODED,r).replace(e.scheme?t.NOT_PATH:t.NOT_PATH_NOSCHEME,m).replace(t.PCT_ENCODED,p)),void 0!==e.query&&(e.query=String(e.query).replace(t.PCT_ENCODED,r).replace(t.NOT_QUERY,m).replace(t.PCT_ENCODED,p)),void 0!==e.fragment&&(e.fragment=String(e.fragment).replace(t.PCT_ENCODED,r).replace(t.NOT_FRAGMENT,m).replace(t.PCT_ENCODED,p)),e}function S(e){return e.replace(/^0*(.*)/,"$1")||"0"}function b(e,r){var t=e.match(r.IPV4ADDRESS)||[],a=w(t,2)[1];return a?a.split(".").map(S).join("."):e}function y(e,r){var t=e.match(r.IPV6ADDRESS)||[],a=w(t,3),s=a[1],o=a[2];if(s){for(var i=s.toLowerCase().split("::").reverse(),n=w(i,2),l=n[0],u=n[1],c=u?u.split(":").map(S):[],h=l.split(":").map(S),d=r.IPV4ADDRESS.test(h[h.length-1]),f=d?7:8,p=h.length-f,m=Array(f),v=0;v<f;++v)m[v]=c[v]||h[p+v]||"";d&&(m[f-1]=b(m[f-1],r));var g=m.reduce(function(e,r,t){if(!r||"0"===r){var a=e[e.length-1];a&&a.index+a.length===t?a.length++:e.push({index:t,length:1})}return e},[]).sort(function(e,r){return r.length-e.length})[0],y=void 0;if(g&&1<g.length){var P=m.slice(0,g.index),E=m.slice(g.index+g.length);y=P.join(":")+"::"+E.join(":")}else y=m.join(":");return o&&(y+="%"+o),y}return e}var P=/^(?:([^:\/?#]+):)?(?:\/\/((?:([^\/?#@]*)@)?(\[[^\/?#\]]+\]|[^\/?#:]*)(?:\:(\d*))?))?([^?#]*)(?:\?([^#]*))?(?:#((?:.|\n|\r)*))?/i,E=void 0==="".match(/(){0}/)[1];function _(e){var r=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},t={},a=!1!==r.iri?h:c;"suffix"===r.reference&&(e=(r.scheme?r.scheme+":":"")+"//"+e);var s=e.match(P);if(s){E?(t.scheme=s[1],t.userinfo=s[3],t.host=s[4],t.port=parseInt(s[5],10),t.path=s[6]||"",t.query=s[7],t.fragment=s[8],isNaN(t.port)&&(t.port=s[5])):(t.scheme=s[1]||void 0,t.userinfo=-1!==e.indexOf("@")?s[3]:void 0,t.host=-1!==e.indexOf("//")?s[4]:void 0,t.port=parseInt(s[5],10),t.path=s[6]||"",t.query=-1!==e.indexOf("?")?s[7]:void 0,t.fragment=-1!==e.indexOf("#")?s[8]:void 0,isNaN(t.port)&&(t.port=e.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/)?s[4]:void 0)),t.host&&(t.host=y(b(t.host,a),a)),t.reference=void 0!==t.scheme||void 0!==t.userinfo||void 0!==t.host||void 0!==t.port||t.path||void 0!==t.query?void 0===t.scheme?"relative":void 0===t.fragment?"absolute":"uri":"same-document",r.reference&&"suffix"!==r.reference&&r.reference!==t.reference&&(t.error=t.error||"URI is not a "+r.reference+" reference.");var o=d[(r.scheme||t.scheme||"").toLowerCase()];if(r.unicodeSupport||o&&o.unicodeSupport)g(t,a);else{if(t.host&&(r.domainHost||o&&o.domainHost))try{t.host=v.toASCII(t.host.replace(a.PCT_ENCODED,f).toLowerCase())}catch(e){t.error=t.error||"Host's domain name can not be converted to ASCII via punycode: "+e}g(t,c)}o&&o.parse&&o.parse(t,r)}else t.error=t.error||"URI can not be parsed.";return t}var F=/^\.\.?\//,x=/^\/\.(\/|$)/,R=/^\/\.\.(\/|$)/,$=/^\/?(?:.|\n)*?(?=\/|$)/;function D(e){for(var r=[];e.length;)if(e.match(F))e=e.replace(F,"");else if(e.match(x))e=e.replace(x,"/");else if(e.match(R))e=e.replace(R,"/"),r.pop();else if("."===e||".."===e)e="";else{var t=e.match($);if(!t)throw new Error("Unexpected dot segment condition");var a=t[0];e=e.slice(a.length),r.push(a)}return r.join("")}function j(r){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},e=t.iri?h:c,a=[],s=d[(t.scheme||r.scheme||"").toLowerCase()];if(s&&s.serialize&&s.serialize(r,t),r.host)if(e.IPV6ADDRESS.test(r.host));else if(t.domainHost||s&&s.domainHost)try{r.host=t.iri?v.toUnicode(r.host):v.toASCII(r.host.replace(e.PCT_ENCODED,f).toLowerCase())}catch(e){r.error=r.error||"Host's domain name can not be converted to "+(t.iri?"Unicode":"ASCII")+" via punycode: "+e}g(r,e),"suffix"!==t.reference&&r.scheme&&(a.push(r.scheme),a.push(":"));var o,i,n,l=(i=!1!==t.iri?h:c,n=[],void 0!==(o=r).userinfo&&(n.push(o.userinfo),n.push("@")),void 0!==o.host&&n.push(y(b(String(o.host),i),i).replace(i.IPV6ADDRESS,function(e,r,t){return"["+r+(t?"%25"+t:"")+"]"})),"number"==typeof o.port&&(n.push(":"),n.push(o.port.toString(10))),n.length?n.join(""):void 0);if(void 0!==l&&("suffix"!==t.reference&&a.push("//"),a.push(l),r.path&&"/"!==r.path.charAt(0)&&a.push("/")),void 0!==r.path){var u=r.path;t.absolutePath||s&&s.absolutePath||(u=D(u)),void 0===l&&(u=u.replace(/^\/\//,"/%2F")),a.push(u)}return void 0!==r.query&&(a.push("?"),a.push(r.query)),void 0!==r.fragment&&(a.push("#"),a.push(r.fragment)),a.join("")}function I(e,r){var t=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},a={};return arguments[3]||(e=_(j(e,t),t),r=_(j(r,t),t)),!(t=t||{}).tolerant&&r.scheme?(a.scheme=r.scheme,a.userinfo=r.userinfo,a.host=r.host,a.port=r.port,a.path=D(r.path||""),a.query=r.query):(void 0!==r.userinfo||void 0!==r.host||void 0!==r.port?(a.userinfo=r.userinfo,a.host=r.host,a.port=r.port,a.path=D(r.path||""),a.query=r.query):(r.path?("/"===r.path.charAt(0)?a.path=D(r.path):(a.path=void 0===e.userinfo&&void 0===e.host&&void 0===e.port||e.path?e.path?e.path.slice(0,e.path.lastIndexOf("/")+1)+r.path:r.path:"/"+r.path,a.path=D(a.path)),a.query=r.query):(a.path=e.path,a.query=void 0!==r.query?r.query:e.query),a.userinfo=e.userinfo,a.host=e.host,a.port=e.port),a.scheme=e.scheme),a.fragment=r.fragment,a}function O(e,r){return e&&e.toString().replace(r&&r.iri?h.PCT_ENCODED:c.PCT_ENCODED,f)}var Q={scheme:"http",domainHost:!0,parse:function(e,r){return e.host||(e.error=e.error||"HTTP URIs must have a host."),e},serialize:function(e,r){return e.port!==("https"!==String(e.scheme).toLowerCase()?80:443)&&""!==e.port||(e.port=void 0),e.path||(e.path="/"),e}},V={scheme:"https",domainHost:Q.domainHost,parse:Q.parse,serialize:Q.serialize},H={},M="[A-Za-z0-9\\-\\.\\_\\~\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]",B="[0-9A-Fa-f]",K=k(k("%[EFef]"+B+"%"+B+B+"%"+B+B)+"|"+k("%[89A-Fa-f]"+B+"%"+B+B)+"|"+k("%"+B+B)),J=C("[\\!\\$\\%\\'\\(\\)\\*\\+\\,\\-\\.0-9\\<\\>A-Z\\x5E-\\x7E]",'[\\"\\\\]'),Z=new RegExp(M,"g"),G=new RegExp(K,"g"),Y=new RegExp(C("[^]","[A-Za-z0-9\\!\\$\\%\\'\\*\\+\\-\\^\\_\\`\\{\\|\\}\\~]","[\\.]",'[\\"]',J),"g"),W=new RegExp(C("[^]",M,"[\\!\\$\\'\\(\\)\\*\\+\\,\\;\\:\\@]"),"g"),X=W;function ee(e){var r=f(e);return r.match(Z)?r:e}var re={scheme:"mailto",parse:function(e,r){var t=e,a=t.to=t.path?t.path.split(","):[];if(t.path=void 0,t.query){for(var s=!1,o={},i=t.query.split("&"),n=0,l=i.length;n<l;++n){var u=i[n].split("=");switch(u[0]){case"to":for(var c=u[1].split(","),h=0,d=c.length;h<d;++h)a.push(c[h]);break;case"subject":t.subject=O(u[1],r);break;case"body":t.body=O(u[1],r);break;default:s=!0,o[O(u[0],r)]=O(u[1],r)}}s&&(t.headers=o)}t.query=void 0;for(var f=0,p=a.length;f<p;++f){var m=a[f].split("@");if(m[0]=O(m[0]),r.unicodeSupport)m[1]=O(m[1],r).toLowerCase();else try{m[1]=v.toASCII(O(m[1],r).toLowerCase())}catch(e){t.error=t.error||"Email address's domain name can not be converted to ASCII via punycode: "+e}a[f]=m.join("@")}return t},serialize:function(e,r){var t,a=e,s=null!=(t=e.to)?t instanceof Array?t:"number"!=typeof t.length||t.split||t.setInterval||t.call?[t]:Array.prototype.slice.call(t):[];if(s){for(var o=0,i=s.length;o<i;++o){var n=String(s[o]),l=n.lastIndexOf("@"),u=n.slice(0,l).replace(G,ee).replace(G,p).replace(Y,m),c=n.slice(l+1);try{c=r.iri?v.toUnicode(c):v.toASCII(O(c,r).toLowerCase())}catch(e){a.error=a.error||"Email address's domain name can not be converted to "+(r.iri?"Unicode":"ASCII")+" via punycode: "+e}s[o]=u+"@"+c}a.path=s.join(",")}var h=e.headers=e.headers||{};e.subject&&(h.subject=e.subject),e.body&&(h.body=e.body);var d=[];for(var f in h)h[f]!==H[f]&&d.push(f.replace(G,ee).replace(G,p).replace(W,m)+"="+h[f].replace(G,ee).replace(G,p).replace(X,m));return d.length&&(a.query=d.join("&")),a}},te=/^([^\:]+)\:(.*)/,ae={scheme:"urn",parse:function(e,r){var t=e.path&&e.path.match(te),a=e;if(t){var s=r.scheme||a.scheme||"urn",o=t[1].toLowerCase(),i=t[2],n=d[s+":"+(r.nid||o)];a.nid=o,a.nss=i,a.path=void 0,n&&(a=n.parse(a,r))}else a.error=a.error||"URN can not be parsed.";return a},serialize:function(e,r){var t=e.nid,a=d[(r.scheme||e.scheme||"urn")+":"+(r.nid||t)];a&&(e=a.serialize(e,r));var s=e;return s.path=(t||r.nid)+":"+e.nss,s}},se=/^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/,oe={scheme:"urn:uuid",parse:function(e,r){var t=e;return t.uuid=t.nss,t.nss=void 0,r.tolerant||t.uuid&&t.uuid.match(se)||(t.error=t.error||"UUID is not valid."),t},serialize:function(e,r){var t=e;return t.nss=(e.uuid||"").toLowerCase(),t}};d[Q.scheme]=Q,d[V.scheme]=V,d[re.scheme]=re,d[ae.scheme]=ae,d[oe.scheme]=oe,e.SCHEMES=d,e.pctEncChar=m,e.pctDecChars=f,e.parse=_,e.removeDotSegments=D,e.serialize=j,e.resolveComponents=I,e.resolve=function(e,r,t){var a=function(e,r){var t=e;if(r)for(var a in r)t[a]=r[a];return t}({scheme:"null"},t);return j(I(_(e,a),_(r,a),a,!0),a)},e.normalize=function(e,r){return"string"==typeof e?e=j(_(e,r),r):"object"===a(e)&&(e=_(j(e,r),r)),e},e.equal=function(e,r,t){return"string"==typeof e?e=j(_(e,t),t):"object"===a(e)&&(e=j(e,t)),"string"==typeof r?r=j(_(r,t),t):"object"===a(r)&&(r=j(r,t)),e===r},e.escapeComponent=function(e,r){return e&&e.toString().replace(r&&r.iri?h.ESCAPE:c.ESCAPE,m)},e.unescapeComponent=O,Object.defineProperty(e,"__esModule",{value:!0})}("object"==typeof t&&void 0!==r?t:a.URI=a.URI||{})},{}],ajv:[function(a,e,r){"use strict";var n=a("./compile"),d=a("./compile/resolve"),t=a("./cache"),f=a("./compile/schema_obj"),s=a("fast-json-stable-stringify"),o=a("./compile/formats"),i=a("./compile/rules"),l=a("./data"),u=a("./compile/util");(e.exports=g).prototype.validate=function(e,r){var t;if("string"==typeof e){if(!(t=this.getSchema(e)))throw new Error('no schema with key or ref "'+e+'"')}else{var a=this._addSchema(e);t=a.validate||this._compile(a)}var s=t(r);!0!==t.$async&&(this.errors=t.errors);return s},g.prototype.compile=function(e,r){var t=this._addSchema(e,void 0,r);return t.validate||this._compile(t)},g.prototype.addSchema=function(e,r,t,a){if(Array.isArray(e)){for(var s=0;s<e.length;s++)this.addSchema(e[s],void 0,t,a);return this}var o=this._getId(e);if(void 0!==o&&"string"!=typeof o)throw new Error("schema id must be string");return b(this,r=d.normalizeId(r||o)),this._schemas[r]=this._addSchema(e,t,a,!0),this},g.prototype.addMetaSchema=function(e,r,t){return this.addSchema(e,r,t,!0),this},g.prototype.validateSchema=function(e,r){var t=e.$schema;if(void 0!==t&&"string"!=typeof t)throw new Error("$schema must be a string");if(!(t=t||this._opts.defaultMeta||(a=this,s=a._opts.meta,a._opts.defaultMeta="object"==typeof s?a._getId(s)||s:a.getSchema(p)?p:void 0,a._opts.defaultMeta)))return this.logger.warn("meta-schema not available"),!(this.errors=null);var a,s;var o,i=this._formats.uri;this._formats.uri="function"==typeof i?this._schemaUriFormatFunc:this._schemaUriFormat;try{o=this.validate(t,e)}finally{this._formats.uri=i}if(!o&&r){var n="schema is invalid: "+this.errorsText();if("log"!=this._opts.validateSchema)throw new Error(n);this.logger.error(n)}return o},g.prototype.getSchema=function(e){var r=y(this,e);switch(typeof r){case"object":return r.validate||this._compile(r);case"string":return this.getSchema(r);case"undefined":return function(e,r){var t=d.schema.call(e,{schema:{}},r);if(t){var a=t.schema,s=t.root,o=t.baseId,i=n.call(e,a,s,void 0,o);return e._fragments[r]=new f({ref:r,fragment:!0,schema:a,root:s,baseId:o,validate:i}),i}}(this,e)}},g.prototype.removeSchema=function(e){if(e instanceof RegExp)return P(this,this._schemas,e),P(this,this._refs,e),this;switch(typeof e){case"undefined":return P(this,this._schemas),P(this,this._refs),this._cache.clear(),this;case"string":var r=y(this,e);return r&&this._cache.del(r.cacheKey),delete this._schemas[e],delete this._refs[e],this;case"object":var t=this._opts.serialize,a=t?t(e):e;this._cache.del(a);var s=this._getId(e);s&&(s=d.normalizeId(s),delete this._schemas[s],delete this._refs[s])}return this},g.prototype.addFormat=function(e,r){"string"==typeof r&&(r=new RegExp(r));return this._formats[e]=r,this},g.prototype.errorsText=function(e,r){if(!(e=e||this.errors))return"No errors";for(var t=void 0===(r=r||{}).separator?", ":r.separator,a=void 0===r.dataVar?"data":r.dataVar,s="",o=0;o<e.length;o++){var i=e[o];i&&(s+=a+i.dataPath+" "+i.message+t)}return s.slice(0,-t.length)},g.prototype._addSchema=function(e,r,t,a){if("object"!=typeof e&&"boolean"!=typeof e)throw new Error("schema should be object or boolean");var s=this._opts.serialize,o=s?s(e):e,i=this._cache.get(o);if(i)return i;a=a||!1!==this._opts.addUsedSchema;var n=d.normalizeId(this._getId(e));n&&a&&b(this,n);var l,u=!1!==this._opts.validateSchema&&!r;u&&!(l=n&&n==d.normalizeId(e.$schema))&&this.validateSchema(e,!0);var c=d.ids.call(this,e),h=new f({id:n,schema:e,localRefs:c,cacheKey:o,meta:t});"#"!=n[0]&&a&&(this._refs[n]=h);this._cache.put(o,h),u&&l&&this.validateSchema(e,!0);return h},g.prototype._compile=function(t,e){if(t.compiling)return(t.validate=s).schema=t.schema,s.errors=null,s.root=e||s,!0===t.schema.$async&&(s.$async=!0),s;var r,a;t.compiling=!0,t.meta&&(r=this._opts,this._opts=this._metaOpts);try{a=n.call(this,t.schema,e,t.localRefs)}finally{t.compiling=!1,t.meta&&(this._opts=r)}return t.validate=a,t.refs=a.refs,t.refVal=a.refVal,t.root=a.root,a;function s(){var e=t.validate,r=e.apply(this,arguments);return s.errors=e.errors,r}},g.prototype.compileAsync=a("./compile/async");var c=a("./keyword");g.prototype.addKeyword=c.add,g.prototype.getKeyword=c.get,g.prototype.removeKeyword=c.remove;var h=a("./compile/error_classes");g.ValidationError=h.Validation,g.MissingRefError=h.MissingRef,g.$dataMetaSchema=l;var p="http://json-schema.org/draft-07/schema",m=["removeAdditional","useDefaults","coerceTypes"],v=["/properties"];function g(e){if(!(this instanceof g))return new g(e);e=this._opts=u.copy(e)||{},function(e){var r=e._opts.logger;if(!1===r)e.logger={log:_,warn:_,error:_};else{if(void 0===r&&(r=console),!("object"==typeof r&&r.log&&r.warn&&r.error))throw new Error("logger must implement log, warn and error methods");e.logger=r}}(this),this._schemas={},this._refs={},this._fragments={},this._formats=o(e.format);var r=this._schemaUriFormat=this._formats["uri-reference"];this._schemaUriFormatFunc=function(e){return r.test(e)},this._cache=e.cache||new t,this._loadingSchemas={},this._compilations=[],this.RULES=i(),this._getId=function(e){switch(e.schemaId){case"auto":return S;case"id":return E;default:return w}}(e),e.loopRequired=e.loopRequired||1/0,"property"==e.errorDataPath&&(e._errorDataPathProperty=!0),void 0===e.serialize&&(e.serialize=s),this._metaOpts=function(e){for(var r=u.copy(e._opts),t=0;t<m.length;t++)delete r[m[t]];return r}(this),e.formats&&function(e){for(var r in e._opts.formats){var t=e._opts.formats[r];e.addFormat(r,t)}}(this),function(e){var r;e._opts.$data&&(r=a("./refs/data.json"),e.addMetaSchema(r,r.$id,!0));if(!1===e._opts.meta)return;var t=a("./refs/json-schema-draft-07.json");e._opts.$data&&(t=l(t,v));e.addMetaSchema(t,p,!0),e._refs["http://json-schema.org/schema"]=p}(this),"object"==typeof e.meta&&this.addMetaSchema(e.meta),function(e){var r=e._opts.schemas;if(!r)return;if(Array.isArray(r))e.addSchema(r);else for(var t in r)e.addSchema(r[t],t)}(this)}function y(e,r){return r=d.normalizeId(r),e._schemas[r]||e._refs[r]||e._fragments[r]}function P(e,r,t){for(var a in r){var s=r[a];s.meta||t&&!t.test(a)||(e._cache.del(s.cacheKey),delete r[a])}}function E(e){return e.$id&&this.logger.warn("schema $id ignored",e.$id),e.id}function w(e){return e.id&&this.logger.warn("schema id ignored",e.id),e.$id}function S(e){if(e.$id&&e.id&&e.$id!=e.id)throw new Error("schema $id is different from id");return e.$id||e.id}function b(e,r){if(e._schemas[r]||e._refs[r])throw new Error('schema with key or id "'+r+'" already exists')}function _(){}},{"./cache":1,"./compile":5,"./compile/async":2,"./compile/error_classes":3,"./compile/formats":4,"./compile/resolve":6,"./compile/rules":7,"./compile/schema_obj":8,"./compile/util":10,"./data":11,"./keyword":38,"./refs/data.json":39,"./refs/json-schema-draft-07.json":40,"fast-json-stable-stringify":42}]},{},[])("ajv")});
+//# sourceMappingURL=ajv.min.js.map
+var telemetrySchema = [{"$id":"http://api.ekstep.org/telemetry/actor","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/actor/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/actor/type","type":"string"}},"required":["type","id"]},{"$id":"http://api.ekstep.org/telemetry/assess","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["ASSESS"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["item","pass","score","resvalues","duration"],"properties":{"item":{"$ref":"http://api.ekstep.org/telemetry/question"},"index":{"$id":"http://api.ekstep.org/telemetry/edata/index","type":"number"},"pass":{"$id":"http://api.ekstep.org/telemetry/edata/pass","type":"string"},"score":{"$id":"http://api.ekstep.org/telemetry/edata/score","type":"number"},"resvalues":{"$id":"http://api.ekstep.org/telemetry/edata/resvalues","type":"array","items":{"type":"object"}},"duration":{"$id":"http://api.ekstep.org/telemetry/edata/duration","type":"number"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/audit","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["AUDIT"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"properties":{"props":{"$id":"http://api.ekstep.org/telemetry/edata/props","type":"array","items":{"type":"string"}},"state":{"$id":"http://api.ekstep.org/telemetry/edata/state","type":"string"},"prevstate":{"$id":"http://api.ekstep.org/telemetry/edata/prevstate","type":"string"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/cdata","type":"array","items":{"type":"object","properties":{"type":{"$id":"http://api.ekstep.org/telemetry/cdata/type","type":"string"},"id":{"$id":"http://api.ekstep.org/telemetry/cdata/id","type":"string"}},"additionalProperties":false,"required":["type","id"]}},{"$id":"http://api.ekstep.org/telemetry/common","type":"object","properties":{"ets":{"$id":"http://api.ekstep.org/telemetry/ets","type":"number","format":"date-time"},"ver":{"$id":"http://api.ekstep.org/telemetry/ver","type":"string","enum":["3.0"]},"mid":{"$id":"http://api.ekstep.org/telemetry/mid","type":"string","minLength":1},"actor":{"$ref":"http://api.ekstep.org/telemetry/actor"},"context":{"$ref":"http://api.ekstep.org/telemetry/context"},"object":{"$ref":"http://api.ekstep.org/telemetry/object"},"tags":{"type":"array","items":{"type":"string"}}}},{"$id":"http://api.ekstep.org/telemetry/context","type":"object","properties":{"channel":{"$id":"http://api.ekstep.org/telemetry/context/channel","type":"string","minLength":1},"pdata":{"$ref":"http://api.ekstep.org/telemetry/pdata"},"env":{"$id":"http://api.ekstep.org/telemetry/context/env","type":"string"},"sid":{"$id":"http://api.ekstep.org/telemetry/context/sid","type":"string"},"did":{"$id":"http://api.ekstep.org/telemetry/context/did","type":"string"},"cdata":{"$ref":"http://api.ekstep.org/telemetry/cdata"}},"required":["channel","env","pdata"]},{"$id":"http://api.ekstep.org/telemetry/dspec","type":"object","properties":{"os":{"$id":"http://api.ekstep.org/telemetry/dspec/os","type":"string"},"make":{"$id":"http://api.ekstep.org/telemetry/dspec/make","type":"string"},"id":{"$id":"http://api.ekstep.org/telemetry/dspec/id","type":"string"},"mem":{"$id":"http://api.ekstep.org/telemetry/dspec/mem","type":"number","minimum":-1},"idisk":{"$id":"http://api.ekstep.org/telemetry/dspec/idisk","type":"number","minimum":-1},"edisk":{"$id":"http://api.ekstep.org/telemetry/dspec/edisk","type":"number","minimum":-1},"scrn":{"$id":"http://api.ekstep.org/telemetry/dspec/scrn","type":"number","minimum":-1},"camera":{"$id":"http://api.ekstep.org/telemetry/dspec/camera","type":"string"},"cpu":{"$id":"http://api.ekstep.org/telemetry/dspec/cpu","type":"string"},"sims":{"$id":"http://api.ekstep.org/telemetry/dspec/sims","type":"number","minimum":-1},"cap":{"$id":"http://api.ekstep.org/telemetry/dspec/cap","type":"array","items":{"type":"string"}}}},{"$id":"http://api.ekstep.org/telemetry/end","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["END"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"mode":{"$id":"http://api.ekstep.org/telemetry/edata/mode","type":"string"},"duration":{"$id":"http://api.ekstep.org/telemetry/edata/duration","type":"number"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"},"summary":{"$id":"http://api.ekstep.org/telemetry/edata/summary","type":"array","items":{"type":"object"}}}}}}]},{"$id":"http://api.ekstep.org/telemetry/error","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["ERROR"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["err","errtype","stacktrace"],"properties":{"err":{"$id":"http://api.ekstep.org/telemetry/edata/err","type":"string"},"errtype":{"$id":"http://api.ekstep.org/telemetry/edata/errtype","type":"string"},"stacktrace":{"$id":"http://api.ekstep.org/telemetry/edata/stacktrace","type":"string"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"},"object":{"$ref":"http://api.ekstep.org/telemetry/inlineobject"},"plugin":{"$ref":"http://api.ekstep.org/telemetry/plugin"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/exdata","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["EXDATA"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"data":{"$id":"http://api.ekstep.org/telemetry/edata/data","type":"string"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/feedback","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["FEEDBACK"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"properties":{"rating":{"$id":"http://api.ekstep.org/telemetry/edata/rating","type":"number"},"comments":{"$id":"http://api.ekstep.org/telemetry/edata/comments","type":"string"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/heartbeat","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["HEARTBEAT"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object"}}}]},{"$id":"http://api.ekstep.org/telemetry/impression","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["IMPRESSION"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type","pageid","uri"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"subtype":{"$id":"http://api.ekstep.org/telemetry/edata/subtype","type":"string"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"},"uri":{"$id":"http://api.ekstep.org/telemetry/edata/uri","type":"string"},"duration":{"$id":"http://api.ekstep.org/telemetry/edata/duration","type":"number"},"visits":{"$id":"http://api.ekstep.org/telemetry/edata/visits","type":"array","items":{"type":"object","properties":{"objid":{"$id":"http://api.ekstep.org/telemetry/edata/visits/objid","type":"string"},"objtype":{"$id":"http://api.ekstep.org/telemetry/edata/visits/objtype","type":"string"},"objver":{"$id":"http://api.ekstep.org/telemetry/edata/visits/objver","type":"string"},"section":{"$id":"http://api.ekstep.org/telemetry/edata/visits/section","type":"string"},"index":{"$id":"http://api.ekstep.org/telemetry/edata/visits/index","type":"number"}},"additionalProperties":false,"required":["objid","objtype"]}}}}}}]},{"$id":"http://api.ekstep.org/telemetry/inlineobject","type":"object","additionalProperties":false,"required":["id","type","ver"],"properties":{"id":{"$id":"http://api.ekstep.org/telemetry/inlineobject/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/inlineobject/type","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/inlineobject/ver","type":"string"},"subtype":{"$id":"http://api.ekstep.org/telemetry/inlineobject/subtype","type":"string"},"name":{"$id":"http://api.ekstep.org/telemetry/inlineobject/name","type":"string"},"code":{"$id":"http://api.ekstep.org/telemetry/inlineobject/code","type":"string"},"parent":{"$ref":"http://api.ekstep.org/telemetry/parent"}}},{"$id":"http://api.ekstep.org/telemetry/interact","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["INTERACT"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type","id"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"subtype":{"$id":"http://api.ekstep.org/telemetry/edata/subtype","type":"string"},"id":{"$id":"http://api.ekstep.org/telemetry/edata/id","type":"string"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"},"duration":{"$id":"http://api.ekstep.org/telemetry/edata/duration","type":"number"},"target":{"$ref":"http://api.ekstep.org/telemetry/target"},"plugin":{"$ref":"http://api.ekstep.org/telemetry/plugin"},"extra":{"$id":"http://api.ekstep.org/telemetry/edata/extra","type":"object"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/interrupt","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["INTERRUPT"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/items","type":"array","items":{"type":"object","additionalProperties":false,"properties":{"id":{"$id":"http://api.ekstep.org/telemetry/items/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/items/type","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/items/ver","type":"string"},"params":{"$id":"http://api.ekstep.org/telemetry/items/params","type":"array","items":{"type":"object"}},"origin":{"$id":"http://api.ekstep.org/telemetry/items/origin","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/items/origin/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/items/origin/type","type":"string"}}},"to":{"$id":"http://api.ekstep.org/telemetry/items/to","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/items/to/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/items/to/type","type":"string"}}}}}},{"$id":"http://api.ekstep.org/telemetry/log","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["LOG"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type","level","message"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"level":{"$id":"http://api.ekstep.org/telemetry/edata/level","type":"string"},"message":{"$id":"http://api.ekstep.org/telemetry/edata/message","type":"string"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"},"params":{"$id":"http://api.ekstep.org/telemetry/edata/params","type":"array","items":{"type":"object"}}}}}}]},{"$id":"http://api.ekstep.org/telemetry/object","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/object/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/object/type","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/object/ver","type":"string"},"rollup":{"$ref":"http://api.ekstep.org/telemetry/rollup"}}},{"$id":"http://api.ekstep.org/telemetry/parent","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/parent/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/parent/type","type":"string"}}},{"$id":"http://api.ekstep.org/telemetry/pdata","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/pdata/id","type":"string"},"pid":{"$id":"http://api.ekstep.org/telemetry/pdata/pid","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/pdata/ver","type":"string"}},"required":["id"]},{"$id":"http://api.ekstep.org/telemetry/plugin","type":"object","additionalProperties":false,"required":["id","ver"],"properties":{"id":{"$id":"http://api.ekstep.org/telemetry/plugin/id","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/plugin/ver","type":"string"},"category":{"$id":"http://api.ekstep.org/telemetry/plugin/category","type":"string"}}},{"$id":"http://api.ekstep.org/telemetry/question","type":"object","additionalProperties":false,"required":["id"],"properties":{"id":{"$id":"http://api.ekstep.org/telemetry/question/id","type":"string"},"maxscore":{"$id":"http://api.ekstep.org/telemetry/question/maxscore","type":"number"},"exlength":{"$id":"http://api.ekstep.org/telemetry/question/exlength","type":"number"},"params":{"$id":"http://api.ekstep.org/telemetry/question/params","type":"array","items":{"type":"object"}},"uri":{"$id":"http://api.ekstep.org/telemetry/question/uri","type":"string"},"desc":{"$id":"http://api.ekstep.org/telemetry/question/desc","type":"string"},"title":{"$id":"http://api.ekstep.org/telemetry/question/title","type":"string"},"mmc":{"$id":"http://api.ekstep.org/telemetry/question/mmc","type":"array","items":{"type":"string"}},"mc":{"$id":"http://api.ekstep.org/telemetry/question/mc","type":"array","items":{"type":"string"}}}},{"$id":"http://api.ekstep.org/telemetry/response","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["RESPONSE"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["target","type","values"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/type","type":"string"},"target":{"$ref":"http://api.ekstep.org/telemetry/target"},"values":{"type":"array","items":{"type":"object"}}}}}}]},{"$id":"http://api.ekstep.org/telemetry/rollup","type":"object","properties":{"l1":{"$id":"http://api.ekstep.org/telemetry/context/rollup/l1","type":"string"},"l2":{"$id":"http://api.ekstep.org/telemetry/context/rollup/l2","type":"string"},"l3":{"$id":"http://api.ekstep.org/telemetry/context/rollup/l3","type":"string"},"l4":{"$id":"http://api.ekstep.org/telemetry/context/rollup/l4","type":"string"}}},{"$id":"http://api.ekstep.org/telemetry/search","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["SEARCH"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["query","size","topn"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"query":{"$id":"http://api.ekstep.org/telemetry/edata/query","type":"string"},"filters":{"$id":"http://api.ekstep.org/telemetry/edata/filters","type":"object"},"sort":{"$id":"http://api.ekstep.org/telemetry/edata/sort","type":"object"},"correlationid":{"$id":"http://api.ekstep.org/telemetry/edata/correlationid","type":"string"},"size":{"$id":"http://api.ekstep.org/telemetry/edata/size","type":"number"},"topn":{"$id":"http://api.ekstep.org/telemetry/edata/topn","type":"array","items":{"type":"object"}}}}}}]},{"$id":"http://api.ekstep.org/telemetry/share","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["SHARE"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["items"],"properties":{"dir":{"$id":"http://api.ekstep.org/telemetry/edata/dir","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"items":{"$ref":"http://api.ekstep.org/telemetry/items"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/start","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["START"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"dspec":{"$ref":"http://api.ekstep.org/telemetry/dspec"},"uaspec":{"$ref":"http://api.ekstep.org/telemetry/uaspec"},"loc":{"$id":"http://api.ekstep.org/telemetry/edata/loc","type":"string"},"mode":{"$id":"http://api.ekstep.org/telemetry/edata/mode","type":"string"},"duration":{"$id":"http://api.ekstep.org/telemetry/edata/duration","type":"number"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/target","type":"object","additionalProperties":false,"required":["id","ver","type"],"properties":{"id":{"$id":"http://api.ekstep.org/telemetry/target/id","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/target/ver","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/target/type","type":"string"},"parent":{"$ref":"http://api.ekstep.org/telemetry/parent"}}},{"$id":"http://api.ekstep.org/telemetry/uaspec","type":"object","properties":{"agent":{"$id":"http://api.ekstep.org/telemetry/uaspec/agent","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/uaspec/ver","type":"string"},"system":{"$id":"http://api.ekstep.org/telemetry/uaspec/system","type":"string"},"platform":{"$id":"http://api.ekstep.org/telemetry/uaspec/platform","type":"string"},"raw":{"$id":"http://api.ekstep.org/telemetry/uaspec/raw","type":"string"}}}]
+/**
+ * @author Krushanu Mohapatra<Krushanu.Mohapatra@tarento.com>
+ */
+
+ /****************************************
+* UUID Library for Device ID generation *
+*****************************************/
+
+!function (e) { if ("object" == typeof exports && "undefined" != typeof module) module.exports = e(); else if ("function" == typeof define && define.amd) define([], e); else { var r; r = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : this, r.uuidv1 = e() } }(function () { return function e(r, n, o) { function t(u, f) { if (!n[u]) { if (!r[u]) { var s = "function" == typeof require && require; if (!f && s) return s(u, !0); if (i) return i(u, !0); var d = new Error("Cannot find module '" + u + "'"); throw d.code = "MODULE_NOT_FOUND", d } var a = n[u] = { exports: {} }; r[u][0].call(a.exports, function (e) { var n = r[u][1][e]; return t(n ? n : e) }, a, a.exports, e, r, n, o) } return n[u].exports } for (var i = "function" == typeof require && require, u = 0; u < o.length; u++)t(o[u]); return t }({ 1: [function (e, r, n) { function o(e, r) { var n = r || 0, o = t; return o[e[n++]] + o[e[n++]] + o[e[n++]] + o[e[n++]] + "-" + o[e[n++]] + o[e[n++]] + "-" + o[e[n++]] + o[e[n++]] + "-" + o[e[n++]] + o[e[n++]] + "-" + o[e[n++]] + o[e[n++]] + o[e[n++]] + o[e[n++]] + o[e[n++]] + o[e[n++]] } for (var t = [], i = 0; i < 256; ++i)t[i] = (i + 256).toString(16).substr(1); r.exports = o }, {}], 2: [function (e, r, n) { var o = "undefined" != typeof crypto && crypto.getRandomValues.bind(crypto) || "undefined" != typeof msCrypto && msCrypto.getRandomValues.bind(msCrypto); if (o) { var t = new Uint8Array(16); r.exports = function () { return o(t), t } } else { var i = new Array(16); r.exports = function () { for (var e, r = 0; r < 16; r++)0 === (3 & r) && (e = 4294967296 * Math.random()), i[r] = e >>> ((3 & r) << 3) & 255; return i } } }, {}], 3: [function (e, r, n) { function o(e, r, n) { var o = r && n || 0, a = r || []; e = e || {}; var c = e.node || t, l = void 0 !== e.clockseq ? e.clockseq : i; if (null == c || null == l) { var v = u(); null == c && (c = t = [1 | v[0], v[1], v[2], v[3], v[4], v[5]]), null == l && (l = i = 16383 & (v[6] << 8 | v[7])) } var p = void 0 !== e.msecs ? e.msecs : (new Date).getTime(), y = void 0 !== e.nsecs ? e.nsecs : d + 1, m = p - s + (y - d) / 1e4; if (m < 0 && void 0 === e.clockseq && (l = l + 1 & 16383), (m < 0 || p > s) && void 0 === e.nsecs && (y = 0), y >= 1e4) throw new Error("uuid.v1(): Can't create more than 10M uuids/sec"); s = p, d = y, i = l, p += 122192928e5; var b = (1e4 * (268435455 & p) + y) % 4294967296; a[o++] = b >>> 24 & 255, a[o++] = b >>> 16 & 255, a[o++] = b >>> 8 & 255, a[o++] = 255 & b; var w = p / 4294967296 * 1e4 & 268435455; a[o++] = w >>> 8 & 255, a[o++] = 255 & w, a[o++] = w >>> 24 & 15 | 16, a[o++] = w >>> 16 & 255, a[o++] = l >>> 8 | 128, a[o++] = 255 & l; for (var x = 0; x < 6; ++x)a[o + x] = c[x]; return r ? r : f(a) } var t, i, u = e("./lib/rng"), f = e("./lib/bytesToUuid"), s = 0, d = 0; r.exports = o }, { "./lib/bytesToUuid": 1, "./lib/rng": 2 }] }, {}, [3])(3) });
+
+
+
+var detectClient = function() {
+
+        var nAgt = navigator.userAgent;
+        var browserName = navigator.appName;
+        var fullVersion = '' + parseFloat(navigator.appVersion);
+        var nameOffset, verOffset, ix;
+
+        // In Opera
+        /* istanbul ignore next. Cannot test this as the test cases runs in phatomjs browser */
+        if ((verOffset = nAgt.indexOf("Opera")) != -1) {
+            browserName = "opera";
+            fullVersion = nAgt.substring(verOffset + 6);
+            if ((verOffset = nAgt.indexOf("Version")) != -1)
+                fullVersion = nAgt.substring(verOffset + 8);
+        }
+        // In MSIE
+        else if ((verOffset = nAgt.indexOf("MSIE")) != -1) {
+            browserName = "IE";
+            fullVersion = nAgt.substring(verOffset + 5);
+        }
+        // In Chrome
+        else if ((verOffset = nAgt.indexOf("Chrome")) != -1) {
+            browserName = "chrome";
+            fullVersion = nAgt.substring(verOffset + 7);
+        }
+        // In Safari
+        else if ((verOffset = nAgt.indexOf("Safari")) != -1) {
+            browserName = "safari";
+            fullVersion = nAgt.substring(verOffset + 7);
+            if ((verOffset = nAgt.indexOf("Version")) != -1)
+                fullVersion = nAgt.substring(verOffset + 8);
+        }
+        // In Firefox
+        else if ((verOffset = nAgt.indexOf("Firefox")) != -1) {
+            browserName = "firefox";
+            fullVersion = nAgt.substring(verOffset + 8);
+        }
+
+        // trim the fullVersion string at semicolon/space if present
+        /* istanbul ignore next. Cannot test this as the test cases runs in phatomjs browser */
+        if ((ix = fullVersion.indexOf(";")) != -1)
+            fullVersion = fullVersion.substring(0, ix);
+        /* istanbul ignore next. Cannot test this as the test cases runs in phatomjs browser */
+        if ((ix = fullVersion.indexOf(" ")) != -1)
+            fullVersion = fullVersion.substring(0, ix);
+
+        return { browser: browserName, browserver: fullVersion, os: navigator.platform };
+    }
+
+/*
+CryptoJS v3.1.2
+code.google.com/p/crypto-js
+(c) 2009-2013 by Jeff Mott. All rights reserved.
+code.google.com/p/crypto-js/wiki/License
+*/
+var CryptoJS = CryptoJS || function(s, p) {
+    var m = {},
+        l = m.lib = {},
+        n = function() {},
+        r = l.Base = {
+            extend: function(b) {
+                n.prototype = this;
+                var h = new n;
+                b && h.mixIn(b);
+                h.hasOwnProperty("init") || (h.init = function() {
+                    h.$super.init.apply(this, arguments)
+                });
+                h.init.prototype = h;
+                h.$super = this;
+                return h
+            },
+            create: function() {
+                var b = this.extend();
+                b.init.apply(b, arguments);
+                return b
+            },
+            init: function() {},
+            mixIn: function(b) {
+                for (var h in b) b.hasOwnProperty(h) && (this[h] = b[h]);
+                b.hasOwnProperty("toString") && (this.toString = b.toString)
+            },
+            clone: function() {
+                return this.init.prototype.extend(this)
+            }
+        },
+        q = l.WordArray = r.extend({
+            init: function(b, h) {
+                b = this.words = b || [];
+                this.sigBytes = h != p ? h : 4 * b.length
+            },
+            toString: function(b) {
+                return (b || t).stringify(this)
+            },
+            concat: function(b) {
+                var h = this.words,
+                    a = b.words,
+                    j = this.sigBytes;
+                b = b.sigBytes;
+                this.clamp();
+                if (j % 4)
+                    for (var g = 0; g < b; g++) h[j + g >>> 2] |= (a[g >>> 2] >>> 24 - 8 * (g % 4) & 255) << 24 - 8 * ((j + g) % 4);
+                else if (65535 < a.length)
+                    for (g = 0; g < b; g += 4) h[j + g >>> 2] = a[g >>> 2];
+                else h.push.apply(h, a);
+                this.sigBytes += b;
+                return this
+            },
+            clamp: function() {
+                var b = this.words,
+                    h = this.sigBytes;
+                b[h >>> 2] &= 4294967295 <<
+                    32 - 8 * (h % 4);
+                b.length = s.ceil(h / 4)
+            },
+            clone: function() {
+                var b = r.clone.call(this);
+                b.words = this.words.slice(0);
+                return b
+            },
+            random: function(b) {
+                for (var h = [], a = 0; a < b; a += 4) h.push(4294967296 * s.random() | 0);
+                return new q.init(h, b)
+            }
+        }),
+        v = m.enc = {},
+        t = v.Hex = {
+            stringify: function(b) {
+                var a = b.words;
+                b = b.sigBytes;
+                for (var g = [], j = 0; j < b; j++) {
+                    var k = a[j >>> 2] >>> 24 - 8 * (j % 4) & 255;
+                    g.push((k >>> 4).toString(16));
+                    g.push((k & 15).toString(16))
+                }
+                return g.join("")
+            },
+            parse: function(b) {
+                for (var a = b.length, g = [], j = 0; j < a; j += 2) g[j >>> 3] |= parseInt(b.substr(j,
+                    2), 16) << 24 - 4 * (j % 8);
+                return new q.init(g, a / 2)
+            }
+        },
+        a = v.Latin1 = {
+            stringify: function(b) {
+                var a = b.words;
+                b = b.sigBytes;
+                for (var g = [], j = 0; j < b; j++) g.push(String.fromCharCode(a[j >>> 2] >>> 24 - 8 * (j % 4) & 255));
+                return g.join("")
+            },
+            parse: function(b) {
+                for (var a = b.length, g = [], j = 0; j < a; j++) g[j >>> 2] |= (b.charCodeAt(j) & 255) << 24 - 8 * (j % 4);
+                return new q.init(g, a)
+            }
+        },
+        u = v.Utf8 = {
+            stringify: function(b) {
+                try {
+                    return decodeURIComponent(escape(a.stringify(b)))
+                } catch (g) {
+                    throw Error("Malformed UTF-8 data");
+                }
+            },
+            parse: function(b) {
+                return a.parse(unescape(encodeURIComponent(b)))
+            }
+        },
+        g = l.BufferedBlockAlgorithm = r.extend({
+            reset: function() {
+                this._data = new q.init;
+                this._nDataBytes = 0
+            },
+            _append: function(b) {
+                "string" == typeof b && (b = u.parse(b));
+                this._data.concat(b);
+                this._nDataBytes += b.sigBytes
+            },
+            _process: function(b) {
+                var a = this._data,
+                    g = a.words,
+                    j = a.sigBytes,
+                    k = this.blockSize,
+                    m = j / (4 * k),
+                    m = b ? s.ceil(m) : s.max((m | 0) - this._minBufferSize, 0);
+                b = m * k;
+                j = s.min(4 * b, j);
+                if (b) {
+                    for (var l = 0; l < b; l += k) this._doProcessBlock(g, l);
+                    l = g.splice(0, b);
+                    a.sigBytes -= j
+                }
+                return new q.init(l, j)
+            },
+            clone: function() {
+                var b = r.clone.call(this);
+                b._data = this._data.clone();
+                return b
+            },
+            _minBufferSize: 0
+        });
+    l.Hasher = g.extend({
+        cfg: r.extend(),
+        init: function(b) {
+            this.cfg = this.cfg.extend(b);
+            this.reset()
+        },
+        reset: function() {
+            g.reset.call(this);
+            this._doReset()
+        },
+        update: function(b) {
+            this._append(b);
+            this._process();
+            return this
+        },
+        finalize: function(b) {
+            b && this._append(b);
+            return this._doFinalize()
+        },
+        blockSize: 16,
+        _createHelper: function(b) {
+            return function(a, g) {
+                return (new b.init(g)).finalize(a)
+            }
+        },
+        _createHmacHelper: function(b) {
+            return function(a, g) {
+                return (new k.HMAC.init(b,
+                    g)).finalize(a)
+            }
+        }
+    });
+    var k = m.algo = {};
+    return m
+}(Math);
+(function(s) {
+    function p(a, k, b, h, l, j, m) {
+        a = a + (k & b | ~k & h) + l + m;
+        return (a << j | a >>> 32 - j) + k
+    }
+
+    function m(a, k, b, h, l, j, m) {
+        a = a + (k & h | b & ~h) + l + m;
+        return (a << j | a >>> 32 - j) + k
+    }
+
+    function l(a, k, b, h, l, j, m) {
+        a = a + (k ^ b ^ h) + l + m;
+        return (a << j | a >>> 32 - j) + k
+    }
+
+    function n(a, k, b, h, l, j, m) {
+        a = a + (b ^ (k | ~h)) + l + m;
+        return (a << j | a >>> 32 - j) + k
+    }
+    for (var r = CryptoJS, q = r.lib, v = q.WordArray, t = q.Hasher, q = r.algo, a = [], u = 0; 64 > u; u++) a[u] = 4294967296 * s.abs(s.sin(u + 1)) | 0;
+    q = q.MD5 = t.extend({
+        _doReset: function() {
+            this._hash = new v.init([1732584193, 4023233417, 2562383102, 271733878])
+        },
+        _doProcessBlock: function(g, k) {
+            for (var b = 0; 16 > b; b++) {
+                var h = k + b,
+                    w = g[h];
+                g[h] = (w << 8 | w >>> 24) & 16711935 | (w << 24 | w >>> 8) & 4278255360
+            }
+            var b = this._hash.words,
+                h = g[k + 0],
+                w = g[k + 1],
+                j = g[k + 2],
+                q = g[k + 3],
+                r = g[k + 4],
+                s = g[k + 5],
+                t = g[k + 6],
+                u = g[k + 7],
+                v = g[k + 8],
+                x = g[k + 9],
+                y = g[k + 10],
+                z = g[k + 11],
+                A = g[k + 12],
+                B = g[k + 13],
+                C = g[k + 14],
+                D = g[k + 15],
+                c = b[0],
+                d = b[1],
+                e = b[2],
+                f = b[3],
+                c = p(c, d, e, f, h, 7, a[0]),
+                f = p(f, c, d, e, w, 12, a[1]),
+                e = p(e, f, c, d, j, 17, a[2]),
+                d = p(d, e, f, c, q, 22, a[3]),
+                c = p(c, d, e, f, r, 7, a[4]),
+                f = p(f, c, d, e, s, 12, a[5]),
+                e = p(e, f, c, d, t, 17, a[6]),
+                d = p(d, e, f, c, u, 22, a[7]),
+                c = p(c, d, e, f, v, 7, a[8]),
+                f = p(f, c, d, e, x, 12, a[9]),
+                e = p(e, f, c, d, y, 17, a[10]),
+                d = p(d, e, f, c, z, 22, a[11]),
+                c = p(c, d, e, f, A, 7, a[12]),
+                f = p(f, c, d, e, B, 12, a[13]),
+                e = p(e, f, c, d, C, 17, a[14]),
+                d = p(d, e, f, c, D, 22, a[15]),
+                c = m(c, d, e, f, w, 5, a[16]),
+                f = m(f, c, d, e, t, 9, a[17]),
+                e = m(e, f, c, d, z, 14, a[18]),
+                d = m(d, e, f, c, h, 20, a[19]),
+                c = m(c, d, e, f, s, 5, a[20]),
+                f = m(f, c, d, e, y, 9, a[21]),
+                e = m(e, f, c, d, D, 14, a[22]),
+                d = m(d, e, f, c, r, 20, a[23]),
+                c = m(c, d, e, f, x, 5, a[24]),
+                f = m(f, c, d, e, C, 9, a[25]),
+                e = m(e, f, c, d, q, 14, a[26]),
+                d = m(d, e, f, c, v, 20, a[27]),
+                c = m(c, d, e, f, B, 5, a[28]),
+                f = m(f, c,
+                    d, e, j, 9, a[29]),
+                e = m(e, f, c, d, u, 14, a[30]),
+                d = m(d, e, f, c, A, 20, a[31]),
+                c = l(c, d, e, f, s, 4, a[32]),
+                f = l(f, c, d, e, v, 11, a[33]),
+                e = l(e, f, c, d, z, 16, a[34]),
+                d = l(d, e, f, c, C, 23, a[35]),
+                c = l(c, d, e, f, w, 4, a[36]),
+                f = l(f, c, d, e, r, 11, a[37]),
+                e = l(e, f, c, d, u, 16, a[38]),
+                d = l(d, e, f, c, y, 23, a[39]),
+                c = l(c, d, e, f, B, 4, a[40]),
+                f = l(f, c, d, e, h, 11, a[41]),
+                e = l(e, f, c, d, q, 16, a[42]),
+                d = l(d, e, f, c, t, 23, a[43]),
+                c = l(c, d, e, f, x, 4, a[44]),
+                f = l(f, c, d, e, A, 11, a[45]),
+                e = l(e, f, c, d, D, 16, a[46]),
+                d = l(d, e, f, c, j, 23, a[47]),
+                c = n(c, d, e, f, h, 6, a[48]),
+                f = n(f, c, d, e, u, 10, a[49]),
+                e = n(e, f, c, d,
+                    C, 15, a[50]),
+                d = n(d, e, f, c, s, 21, a[51]),
+                c = n(c, d, e, f, A, 6, a[52]),
+                f = n(f, c, d, e, q, 10, a[53]),
+                e = n(e, f, c, d, y, 15, a[54]),
+                d = n(d, e, f, c, w, 21, a[55]),
+                c = n(c, d, e, f, v, 6, a[56]),
+                f = n(f, c, d, e, D, 10, a[57]),
+                e = n(e, f, c, d, t, 15, a[58]),
+                d = n(d, e, f, c, B, 21, a[59]),
+                c = n(c, d, e, f, r, 6, a[60]),
+                f = n(f, c, d, e, z, 10, a[61]),
+                e = n(e, f, c, d, j, 15, a[62]),
+                d = n(d, e, f, c, x, 21, a[63]);
+            b[0] = b[0] + c | 0;
+            b[1] = b[1] + d | 0;
+            b[2] = b[2] + e | 0;
+            b[3] = b[3] + f | 0
+        },
+        _doFinalize: function() {
+            var a = this._data,
+                k = a.words,
+                b = 8 * this._nDataBytes,
+                h = 8 * a.sigBytes;
+            k[h >>> 5] |= 128 << 24 - h % 32;
+            var l = s.floor(b /
+                4294967296);
+            k[(h + 64 >>> 9 << 4) + 15] = (l << 8 | l >>> 24) & 16711935 | (l << 24 | l >>> 8) & 4278255360;
+            k[(h + 64 >>> 9 << 4) + 14] = (b << 8 | b >>> 24) & 16711935 | (b << 24 | b >>> 8) & 4278255360;
+            a.sigBytes = 4 * (k.length + 1);
+            this._process();
+            a = this._hash;
+            k = a.words;
+            for (b = 0; 4 > b; b++) h = k[b], k[b] = (h << 8 | h >>> 24) & 16711935 | (h << 24 | h >>> 8) & 4278255360;
+            return a
+        },
+        clone: function() {
+            var a = t.clone.call(this);
+            a._hash = this._hash.clone();
+            return a
+        }
+    });
+    r.MD5 = t._createHelper(q);
+    r.HmacMD5 = t._createHmacHelper(q)
+})(Math);
+!function (r, u) { "use strict"; var c = "function", i = "undefined", m = "object", s = "model", e = "name", o = "type", n = "vendor", a = "version", d = "architecture", t = "console", l = "mobile", w = "tablet", b = "smarttv", p = "wearable", g = { extend: function (i, s) { var e = {}; for (var o in i) s[o] && s[o].length % 2 == 0 ? e[o] = s[o].concat(i[o]) : e[o] = i[o]; return e }, has: function (i, s) { return "string" == typeof i && -1 !== s.toLowerCase().indexOf(i.toLowerCase()) }, lowerize: function (i) { return i.toLowerCase() }, major: function (i) { return "string" == typeof i ? i.replace(/[^\d\.]/g, "").split(".")[0] : u }, trim: function (i) { return i.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, "") } }, f = { rgx: function (i, s) { for (var e, o, r, n, a, d, t = 0; t < s.length && !a;) { var l = s[t], w = s[t + 1]; for (e = o = 0; e < l.length && !a;)if (a = l[e++].exec(i)) for (r = 0; r < w.length; r++)d = a[++o], typeof (n = w[r]) === m && 0 < n.length ? 2 == n.length ? typeof n[1] == c ? this[n[0]] = n[1].call(this, d) : this[n[0]] = n[1] : 3 == n.length ? typeof n[1] !== c || n[1].exec && n[1].test ? this[n[0]] = d ? d.replace(n[1], n[2]) : u : this[n[0]] = d ? n[1].call(this, d, n[2]) : u : 4 == n.length && (this[n[0]] = d ? n[3].call(this, d.replace(n[1], n[2])) : u) : this[n] = d || u; t += 2 } }, str: function (i, s) { for (var e in s) if (typeof s[e] === m && 0 < s[e].length) { for (var o = 0; o < s[e].length; o++)if (g.has(s[e][o], i)) return "?" === e ? u : e } else if (g.has(s[e], i)) return "?" === e ? u : e; return i } }, h = { browser: { oldsafari: { version: { "1.0": "/8", 1.2: "/1", 1.3: "/3", "2.0": "/412", "2.0.2": "/416", "2.0.3": "/417", "2.0.4": "/419", "?": "/" } } }, device: { amazon: { model: { "Fire Phone": ["SD", "KF"] } }, sprint: { model: { "Evo Shift 4G": "7373KT" }, vendor: { HTC: "APA", Sprint: "Sprint" } } }, os: { windows: { version: { ME: "4.90", "NT 3.11": "NT3.51", "NT 4.0": "NT4.0", 2e3: "NT 5.0", XP: ["NT 5.1", "NT 5.2"], Vista: "NT 6.0", 7: "NT 6.1", 8: "NT 6.2", 8.1: "NT 6.3", 10: ["NT 6.4", "NT 10.0"], RT: "ARM" } } } }, v = { browser: [[/(opera\smini)\/([\w\.-]+)/i, /(opera\s[mobiletab]+).+version\/([\w\.-]+)/i, /(opera).+version\/([\w\.]+)/i, /(opera)[\/\s]+([\w\.]+)/i], [e, a], [/(opios)[\/\s]+([\w\.]+)/i], [[e, "Opera Mini"], a], [/\s(opr)\/([\w\.]+)/i], [[e, "Opera"], a], [/(kindle)\/([\w\.]+)/i, /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?([\w\.]*)/i, /(avant\s|iemobile|slim|baidu)(?:browser)?[\/\s]?([\w\.]*)/i, /(?:ms|\()(ie)\s([\w\.]+)/i, /(rekonq)\/([\w\.]*)/i, /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark)\/([\w\.-]+)/i], [e, a], [/(trident).+rv[:\s]([\w\.]+).+like\sgecko/i], [[e, "IE"], a], [/(edge|edgios|edga)\/((\d+)?[\w\.]+)/i], [[e, "Edge"], a], [/(yabrowser)\/([\w\.]+)/i], [[e, "Yandex"], a], [/(puffin)\/([\w\.]+)/i], [[e, "Puffin"], a], [/(focus)\/([\w\.]+)/i], [[e, "Firefox Focus"], a], [/(opt)\/([\w\.]+)/i], [[e, "Opera Touch"], a], [/((?:[\s\/])uc?\s?browser|(?:juc.+)ucweb)[\/\s]?([\w\.]+)/i], [[e, "UCBrowser"], a], [/(comodo_dragon)\/([\w\.]+)/i], [[e, /_/g, " "], a], [/(micromessenger)\/([\w\.]+)/i], [[e, "WeChat"], a], [/(brave)\/([\w\.]+)/i], [[e, "Brave"], a], [/(qqbrowserlite)\/([\w\.]+)/i], [e, a], [/(QQ)\/([\d\.]+)/i], [e, a], [/m?(qqbrowser)[\/\s]?([\w\.]+)/i], [e, a], [/(BIDUBrowser)[\/\s]?([\w\.]+)/i], [e, a], [/(2345Explorer)[\/\s]?([\w\.]+)/i], [e, a], [/(MetaSr)[\/\s]?([\w\.]+)/i], [e], [/(LBBROWSER)/i], [e], [/xiaomi\/miuibrowser\/([\w\.]+)/i], [a, [e, "MIUI Browser"]], [/;fbav\/([\w\.]+);/i], [a, [e, "Facebook"]], [/safari\s(line)\/([\w\.]+)/i, /android.+(line)\/([\w\.]+)\/iab/i], [e, a], [/headlesschrome(?:\/([\w\.]+)|\s)/i], [a, [e, "Chrome Headless"]], [/\swv\).+(chrome)\/([\w\.]+)/i], [[e, /(.+)/, "$1 WebView"], a], [/((?:oculus|samsung)browser)\/([\w\.]+)/i], [[e, /(.+(?:g|us))(.+)/, "$1 $2"], a], [/android.+version\/([\w\.]+)\s+(?:mobile\s?safari|safari)*/i], [a, [e, "Android Browser"]], [/(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i], [e, a], [/(dolfin)\/([\w\.]+)/i], [[e, "Dolphin"], a], [/((?:android.+)crmo|crios)\/([\w\.]+)/i], [[e, "Chrome"], a], [/(coast)\/([\w\.]+)/i], [[e, "Opera Coast"], a], [/fxios\/([\w\.-]+)/i], [a, [e, "Firefox"]], [/version\/([\w\.]+).+?mobile\/\w+\s(safari)/i], [a, [e, "Mobile Safari"]], [/version\/([\w\.]+).+?(mobile\s?safari|safari)/i], [a, e], [/webkit.+?(gsa)\/([\w\.]+).+?(mobile\s?safari|safari)(\/[\w\.]+)/i], [[e, "GSA"], a], [/webkit.+?(mobile\s?safari|safari)(\/[\w\.]+)/i], [e, [a, f.str, h.browser.oldsafari.version]], [/(konqueror)\/([\w\.]+)/i, /(webkit|khtml)\/([\w\.]+)/i], [e, a], [/(navigator|netscape)\/([\w\.-]+)/i], [[e, "Netscape"], a], [/(swiftfox)/i, /(icedragon|iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo|conkeror)[\/\s]?([\w\.\+]+)/i, /(firefox|seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([\w\.-]+)$/i, /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i, /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|sleipnir)[\/\s]?([\w\.]+)/i, /(links)\s\(([\w\.]+)/i, /(gobrowser)\/?([\w\.]*)/i, /(ice\s?browser)\/v?([\w\._]+)/i, /(mosaic)[\/\s]([\w\.]+)/i], [e, a]], cpu: [[/(?:(amd|x(?:(?:86|64)[_-])?|wow|win)64)[;\)]/i], [[d, "amd64"]], [/(ia32(?=;))/i], [[d, g.lowerize]], [/((?:i[346]|x)86)[;\)]/i], [[d, "ia32"]], [/windows\s(ce|mobile);\sppc;/i], [[d, "arm"]], [/((?:ppc|powerpc)(?:64)?)(?:\smac|;|\))/i], [[d, /ower/, "", g.lowerize]], [/(sun4\w)[;\)]/i], [[d, "sparc"]], [/((?:avr32|ia64(?=;))|68k(?=\))|arm(?:64|(?=v\d+[;l]))|(?=atmel\s)avr|(?:irix|mips|sparc)(?:64)?(?=;)|pa-risc)/i], [[d, g.lowerize]]], device: [[/\((ipad|playbook);[\w\s\);-]+(rim|apple)/i], [s, n, [o, w]], [/applecoremedia\/[\w\.]+ \((ipad)/], [s, [n, "Apple"], [o, w]], [/(apple\s{0,1}tv)/i], [[s, "Apple TV"], [n, "Apple"]], [/(archos)\s(gamepad2?)/i, /(hp).+(touchpad)/i, /(hp).+(tablet)/i, /(kindle)\/([\w\.]+)/i, /\s(nook)[\w\s]+build\/(\w+)/i, /(dell)\s(strea[kpr\s\d]*[\dko])/i], [n, s, [o, w]], [/(kf[A-z]+)\sbuild\/.+silk\//i], [s, [n, "Amazon"], [o, w]], [/(sd|kf)[0349hijorstuw]+\sbuild\/.+silk\//i], [[s, f.str, h.device.amazon.model], [n, "Amazon"], [o, l]], [/android.+aft([bms])\sbuild/i], [s, [n, "Amazon"], [o, b]], [/\((ip[honed|\s\w*]+);.+(apple)/i], [s, n, [o, l]], [/\((ip[honed|\s\w*]+);/i], [s, [n, "Apple"], [o, l]], [/(blackberry)[\s-]?(\w+)/i, /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[\s_-]?([\w-]*)/i, /(hp)\s([\w\s]+\w)/i, /(asus)-?(\w+)/i], [n, s, [o, l]], [/\(bb10;\s(\w+)/i], [s, [n, "BlackBerry"], [o, l]], [/android.+(transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+|nexus 7|padfone)/i], [s, [n, "Asus"], [o, w]], [/(sony)\s(tablet\s[ps])\sbuild\//i, /(sony)?(?:sgp.+)\sbuild\//i], [[n, "Sony"], [s, "Xperia Tablet"], [o, w]], [/android.+\s([c-g]\d{4}|so[-l]\w+)\sbuild\//i], [s, [n, "Sony"], [o, l]], [/\s(ouya)\s/i, /(nintendo)\s([wids3u]+)/i], [n, s, [o, t]], [/android.+;\s(shield)\sbuild/i], [s, [n, "Nvidia"], [o, t]], [/(playstation\s[34portablevi]+)/i], [s, [n, "Sony"], [o, t]], [/(sprint\s(\w+))/i], [[n, f.str, h.device.sprint.vendor], [s, f.str, h.device.sprint.model], [o, l]], [/(lenovo)\s?(S(?:5000|6000)+(?:[-][\w+]))/i], [n, s, [o, w]], [/(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i, /(zte)-(\w*)/i, /(alcatel|geeksphone|lenovo|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]*)/i], [n, [s, /_/g, " "], [o, l]], [/(nexus\s9)/i], [s, [n, "HTC"], [o, w]], [/d\/huawei([\w\s-]+)[;\)]/i, /(nexus\s6p)/i], [s, [n, "Huawei"], [o, l]], [/(microsoft);\s(lumia[\s\w]+)/i], [n, s, [o, l]], [/[\s\(;](xbox(?:\sone)?)[\s\);]/i], [s, [n, "Microsoft"], [o, t]], [/(kin\.[onetw]{3})/i], [[s, /\./g, " "], [n, "Microsoft"], [o, l]], [/\s(milestone|droid(?:[2-4x]|\s(?:bionic|x2|pro|razr))?:?(\s4g)?)[\w\s]+build\//i, /mot[\s-]?(\w*)/i, /(XT\d{3,4}) build\//i, /(nexus\s6)/i], [s, [n, "Motorola"], [o, l]], [/android.+\s(mz60\d|xoom[\s2]{0,2})\sbuild\//i], [s, [n, "Motorola"], [o, w]], [/hbbtv\/\d+\.\d+\.\d+\s+\([\w\s]*;\s*(\w[^;]*);([^;]*)/i], [[n, g.trim], [s, g.trim], [o, b]], [/hbbtv.+maple;(\d+)/i], [[s, /^/, "SmartTV"], [n, "Samsung"], [o, b]], [/\(dtv[\);].+(aquos)/i], [s, [n, "Sharp"], [o, b]], [/android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n\d+|sgh-t8[56]9|nexus 10))/i, /((SM-T\w+))/i], [[n, "Samsung"], s, [o, w]], [/smart-tv.+(samsung)/i], [n, [o, b], s], [/((s[cgp]h-\w+|gt-\w+|galaxy\snexus|sm-\w[\w\d]+))/i, /(sam[sung]*)[\s-]*(\w+-?[\w-]*)/i, /sec-((sgh\w+))/i], [[n, "Samsung"], s, [o, l]], [/sie-(\w*)/i], [s, [n, "Siemens"], [o, l]], [/(maemo|nokia).*(n900|lumia\s\d+)/i, /(nokia)[\s_-]?([\w-]*)/i], [[n, "Nokia"], s, [o, l]], [/android\s3\.[\s\w;-]{10}(a\d{3})/i], [s, [n, "Acer"], [o, w]], [/android.+([vl]k\-?\d{3})\s+build/i], [s, [n, "LG"], [o, w]], [/android\s3\.[\s\w;-]{10}(lg?)-([06cv9]{3,4})/i], [[n, "LG"], s, [o, w]], [/(lg) netcast\.tv/i], [n, s, [o, b]], [/(nexus\s[45])/i, /lg[e;\s\/-]+(\w*)/i, /android.+lg(\-?[\d\w]+)\s+build/i], [s, [n, "LG"], [o, l]], [/android.+(ideatab[a-z0-9\-\s]+)/i], [s, [n, "Lenovo"], [o, w]], [/linux;.+((jolla));/i], [n, s, [o, l]], [/((pebble))app\/[\d\.]+\s/i], [n, s, [o, p]], [/android.+;\s(oppo)\s?([\w\s]+)\sbuild/i], [n, s, [o, l]], [/crkey/i], [[s, "Chromecast"], [n, "Google"]], [/android.+;\s(glass)\s\d/i], [s, [n, "Google"], [o, p]], [/android.+;\s(pixel c)[\s)]/i], [s, [n, "Google"], [o, w]], [/android.+;\s(pixel( [23])?( xl)?)\s/i], [s, [n, "Google"], [o, l]], [/android.+;\s(\w+)\s+build\/hm\1/i, /android.+(hm[\s\-_]*note?[\s_]*(?:\d\w)?)\s+build/i, /android.+(mi[\s\-_]*(?:one|one[\s_]plus|note lte)?[\s_]*(?:\d?\w?)[\s_]*(?:plus)?)\s+build/i, /android.+(redmi[\s\-_]*(?:note)?(?:[\s_]*[\w\s]+))\s+build/i], [[s, /_/g, " "], [n, "Xiaomi"], [o, l]], [/android.+(mi[\s\-_]*(?:pad)(?:[\s_]*[\w\s]+))\s+build/i], [[s, /_/g, " "], [n, "Xiaomi"], [o, w]], [/android.+;\s(m[1-5]\snote)\sbuild/i], [s, [n, "Meizu"], [o, w]], [/(mz)-([\w-]{2,})/i], [[n, "Meizu"], s, [o, l]], [/android.+a000(1)\s+build/i, /android.+oneplus\s(a\d{4})\s+build/i], [s, [n, "OnePlus"], [o, l]], [/android.+[;\/]\s*(RCT[\d\w]+)\s+build/i], [s, [n, "RCA"], [o, w]], [/android.+[;\/\s]+(Venue[\d\s]{2,7})\s+build/i], [s, [n, "Dell"], [o, w]], [/android.+[;\/]\s*(Q[T|M][\d\w]+)\s+build/i], [s, [n, "Verizon"], [o, w]], [/android.+[;\/]\s+(Barnes[&\s]+Noble\s+|BN[RT])(V?.*)\s+build/i], [[n, "Barnes & Noble"], s, [o, w]], [/android.+[;\/]\s+(TM\d{3}.*\b)\s+build/i], [s, [n, "NuVision"], [o, w]], [/android.+;\s(k88)\sbuild/i], [s, [n, "ZTE"], [o, w]], [/android.+[;\/]\s*(gen\d{3})\s+build.*49h/i], [s, [n, "Swiss"], [o, l]], [/android.+[;\/]\s*(zur\d{3})\s+build/i], [s, [n, "Swiss"], [o, w]], [/android.+[;\/]\s*((Zeki)?TB.*\b)\s+build/i], [s, [n, "Zeki"], [o, w]], [/(android).+[;\/]\s+([YR]\d{2})\s+build/i, /android.+[;\/]\s+(Dragon[\-\s]+Touch\s+|DT)(\w{5})\sbuild/i], [[n, "Dragon Touch"], s, [o, w]], [/android.+[;\/]\s*(NS-?\w{0,9})\sbuild/i], [s, [n, "Insignia"], [o, w]], [/android.+[;\/]\s*((NX|Next)-?\w{0,9})\s+build/i], [s, [n, "NextBook"], [o, w]], [/android.+[;\/]\s*(Xtreme\_)?(V(1[045]|2[015]|30|40|60|7[05]|90))\s+build/i], [[n, "Voice"], s, [o, l]], [/android.+[;\/]\s*(LVTEL\-)?(V1[12])\s+build/i], [[n, "LvTel"], s, [o, l]], [/android.+;\s(PH-1)\s/i], [s, [n, "Essential"], [o, l]], [/android.+[;\/]\s*(V(100MD|700NA|7011|917G).*\b)\s+build/i], [s, [n, "Envizen"], [o, w]], [/android.+[;\/]\s*(Le[\s\-]+Pan)[\s\-]+(\w{1,9})\s+build/i], [n, s, [o, w]], [/android.+[;\/]\s*(Trio[\s\-]*.*)\s+build/i], [s, [n, "MachSpeed"], [o, w]], [/android.+[;\/]\s*(Trinity)[\-\s]*(T\d{3})\s+build/i], [n, s, [o, w]], [/android.+[;\/]\s*TU_(1491)\s+build/i], [s, [n, "Rotor"], [o, w]], [/android.+(KS(.+))\s+build/i], [s, [n, "Amazon"], [o, w]], [/android.+(Gigaset)[\s\-]+(Q\w{1,9})\s+build/i], [n, s, [o, w]], [/\s(tablet|tab)[;\/]/i, /\s(mobile)(?:[;\/]|\ssafari)/i], [[o, g.lowerize], n, s], [/(android[\w\.\s\-]{0,9});.+build/i], [s, [n, "Generic"]]], engine: [[/windows.+\sedge\/([\w\.]+)/i], [a, [e, "EdgeHTML"]], [/(presto)\/([\w\.]+)/i, /(webkit|trident|netfront|netsurf|amaya|lynx|w3m)\/([\w\.]+)/i, /(khtml|tasman|links)[\/\s]\(?([\w\.]+)/i, /(icab)[\/\s]([23]\.[\d\.]+)/i], [e, a], [/rv\:([\w\.]{1,9}).+(gecko)/i], [a, e]], os: [[/microsoft\s(windows)\s(vista|xp)/i], [e, a], [/(windows)\snt\s6\.2;\s(arm)/i, /(windows\sphone(?:\sos)*)[\s\/]?([\d\.\s\w]*)/i, /(windows\smobile|windows)[\s\/]?([ntce\d\.\s]+\w)/i], [e, [a, f.str, h.os.windows.version]], [/(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i], [[e, "Windows"], [a, f.str, h.os.windows.version]], [/\((bb)(10);/i], [[e, "BlackBerry"], a], [/(blackberry)\w*\/?([\w\.]*)/i, /(tizen)[\/\s]([\w\.]+)/i, /(android|webos|palm\sos|qnx|bada|rim\stablet\sos|meego|contiki)[\/\s-]?([\w\.]*)/i, /linux;.+(sailfish);/i], [e, a], [/(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]*)/i], [[e, "Symbian"], a], [/\((series40);/i], [e], [/mozilla.+\(mobile;.+gecko.+firefox/i], [[e, "Firefox OS"], a], [/(nintendo|playstation)\s([wids34portablevu]+)/i, /(mint)[\/\s\(]?(\w*)/i, /(mageia|vectorlinux)[;\s]/i, /(joli|[kxln]?ubuntu|debian|suse|opensuse|gentoo|(?=\s)arch|slackware|fedora|mandriva|centos|pclinuxos|redhat|zenwalk|linpus)[\/\s-]?(?!chrom)([\w\.-]*)/i, /(hurd|linux)\s?([\w\.]*)/i, /(gnu)\s?([\w\.]*)/i], [e, a], [/(cros)\s[\w]+\s([\w\.]+\w)/i], [[e, "Chromium OS"], a], [/(sunos)\s?([\w\.\d]*)/i], [[e, "Solaris"], a], [/\s([frentopc-]{0,4}bsd|dragonfly)\s?([\w\.]*)/i], [e, a], [/(haiku)\s(\w+)/i], [e, a], [/cfnetwork\/.+darwin/i, /ip[honead]{2,4}(?:.*os\s([\w]+)\slike\smac|;\sopera)/i], [[a, /_/g, "."], [e, "iOS"]], [/(mac\sos\sx)\s?([\w\s\.]*)/i, /(macintosh|mac(?=_powerpc)\s)/i], [[e, "Mac OS"], [a, /_/g, "."]], [/((?:open)?solaris)[\/\s-]?([\w\.]*)/i, /(aix)\s((\d)(?=\.|\)|\s)[\w\.])*/i, /(plan\s9|minix|beos|os\/2|amigaos|morphos|risc\sos|openvms|fuchsia)/i, /(unix)\s?([\w\.]*)/i], [e, a]] }, x = function (i, s) { if ("object" == typeof i && (s = i, i = u), !(this instanceof x)) return new x(i, s).getResult(); var e = i || (r && r.navigator && r.navigator.userAgent ? r.navigator.userAgent : ""), o = s ? g.extend(v, s) : v; return this.getBrowser = function () { var i = { name: u, version: u }; return f.rgx.call(i, e, o.browser), i.major = g.major(i.version), i }, this.getCPU = function () { var i = { architecture: u }; return f.rgx.call(i, e, o.cpu), i }, this.getDevice = function () { var i = { vendor: u, model: u, type: u }; return f.rgx.call(i, e, o.device), i }, this.getEngine = function () { var i = { name: u, version: u }; return f.rgx.call(i, e, o.engine), i }, this.getOS = function () { var i = { name: u, version: u }; return f.rgx.call(i, e, o.os), i }, this.getResult = function () { return { ua: this.getUA(), browser: this.getBrowser(), engine: this.getEngine(), os: this.getOS(), device: this.getDevice(), cpu: this.getCPU() } }, this.getUA = function () { return e }, this.setUA = function (i) { return e = i, this }, this }; x.VERSION = "0.7.19", x.BROWSER = { NAME: e, MAJOR: "major", VERSION: a }, x.CPU = { ARCHITECTURE: d }, x.DEVICE = { MODEL: s, VENDOR: n, TYPE: o, CONSOLE: t, MOBILE: l, SMARTTV: b, TABLET: w, WEARABLE: p, EMBEDDED: "embedded" }, x.ENGINE = { NAME: e, VERSION: a }, x.OS = { NAME: e, VERSION: a }, typeof exports !== i ? (typeof module !== i && module.exports && (exports = module.exports = x), exports.UAParser = x) : typeof define === c && define.amd ? define(function () { return x }) : r && (r.UAParser = x); var k = r && (r.jQuery || r.Zepto); if (typeof k !== i && !k.ua) { var y = new x; k.ua = y.getResult(), k.ua.get = function () { return y.getUA() }, k.ua.set = function (i) { y.setUA(i); var s = y.getResult(); for (var e in s) k.ua[e] = s[e] } } }("object" == typeof window ? window : this);
+/*
+* Fingerprintjs2 2.0.6 - Modern & flexible browser fingerprint library v2
+* https://github.com/Valve/fingerprintjs2
+* Copyright (c) 2015 Valentin Vasilyev (valentin.vasilyev@outlook.com)
+* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL VALENTIN VASILYEV BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* global define */
+(function (name, context, definition) {
+    'use strict'
+    if (typeof window !== 'undefined' && typeof define === 'function' && define.amd) { define(definition) } else if (typeof module !== 'undefined' && module.exports) { module.exports = definition() } else if (context.exports) { context.exports = definition() } else { context[name] = definition() }
+  })('Fingerprint2', this, function () {
+    'use strict'
+
+  /// MurmurHash3 related functions
+
+  //
+  // Given two 64bit ints (as an array of two 32bit ints) returns the two
+  // added together as a 64bit int (as an array of two 32bit ints).
+  //
+    var x64Add = function (m, n) {
+      m = [m[0] >>> 16, m[0] & 0xffff, m[1] >>> 16, m[1] & 0xffff]
+      n = [n[0] >>> 16, n[0] & 0xffff, n[1] >>> 16, n[1] & 0xffff]
+      var o = [0, 0, 0, 0]
+      o[3] += m[3] + n[3]
+      o[2] += o[3] >>> 16
+      o[3] &= 0xffff
+      o[2] += m[2] + n[2]
+      o[1] += o[2] >>> 16
+      o[2] &= 0xffff
+      o[1] += m[1] + n[1]
+      o[0] += o[1] >>> 16
+      o[1] &= 0xffff
+      o[0] += m[0] + n[0]
+      o[0] &= 0xffff
+      return [(o[0] << 16) | o[1], (o[2] << 16) | o[3]]
+    }
+
+  //
+  // Given two 64bit ints (as an array of two 32bit ints) returns the two
+  // multiplied together as a 64bit int (as an array of two 32bit ints).
+  //
+    var x64Multiply = function (m, n) {
+      m = [m[0] >>> 16, m[0] & 0xffff, m[1] >>> 16, m[1] & 0xffff]
+      n = [n[0] >>> 16, n[0] & 0xffff, n[1] >>> 16, n[1] & 0xffff]
+      var o = [0, 0, 0, 0]
+      o[3] += m[3] * n[3]
+      o[2] += o[3] >>> 16
+      o[3] &= 0xffff
+      o[2] += m[2] * n[3]
+      o[1] += o[2] >>> 16
+      o[2] &= 0xffff
+      o[2] += m[3] * n[2]
+      o[1] += o[2] >>> 16
+      o[2] &= 0xffff
+      o[1] += m[1] * n[3]
+      o[0] += o[1] >>> 16
+      o[1] &= 0xffff
+      o[1] += m[2] * n[2]
+      o[0] += o[1] >>> 16
+      o[1] &= 0xffff
+      o[1] += m[3] * n[1]
+      o[0] += o[1] >>> 16
+      o[1] &= 0xffff
+      o[0] += (m[0] * n[3]) + (m[1] * n[2]) + (m[2] * n[1]) + (m[3] * n[0])
+      o[0] &= 0xffff
+      return [(o[0] << 16) | o[1], (o[2] << 16) | o[3]]
+    }
+  //
+  // Given a 64bit int (as an array of two 32bit ints) and an int
+  // representing a number of bit positions, returns the 64bit int (as an
+  // array of two 32bit ints) rotated left by that number of positions.
+  //
+    var x64Rotl = function (m, n) {
+      n %= 64
+      if (n === 32) {
+        return [m[1], m[0]]
+      } else if (n < 32) {
+        return [(m[0] << n) | (m[1] >>> (32 - n)), (m[1] << n) | (m[0] >>> (32 - n))]
+      } else {
+        n -= 32
+        return [(m[1] << n) | (m[0] >>> (32 - n)), (m[0] << n) | (m[1] >>> (32 - n))]
+      }
+    }
+  //
+  // Given a 64bit int (as an array of two 32bit ints) and an int
+  // representing a number of bit positions, returns the 64bit int (as an
+  // array of two 32bit ints) shifted left by that number of positions.
+  //
+    var x64LeftShift = function (m, n) {
+      n %= 64
+      if (n === 0) {
+        return m
+      } else if (n < 32) {
+        return [(m[0] << n) | (m[1] >>> (32 - n)), m[1] << n]
+      } else {
+        return [m[1] << (n - 32), 0]
+      }
+    }
+  //
+  // Given two 64bit ints (as an array of two 32bit ints) returns the two
+  // xored together as a 64bit int (as an array of two 32bit ints).
+  //
+    var x64Xor = function (m, n) {
+      return [m[0] ^ n[0], m[1] ^ n[1]]
+    }
+  //
+  // Given a block, returns murmurHash3's final x64 mix of that block.
+  // (`[0, h[0] >>> 1]` is a 33 bit unsigned right shift. This is the
+  // only place where we need to right shift 64bit ints.)
+  //
+    var x64Fmix = function (h) {
+      h = x64Xor(h, [0, h[0] >>> 1])
+      h = x64Multiply(h, [0xff51afd7, 0xed558ccd])
+      h = x64Xor(h, [0, h[0] >>> 1])
+      h = x64Multiply(h, [0xc4ceb9fe, 0x1a85ec53])
+      h = x64Xor(h, [0, h[0] >>> 1])
+      return h
+    }
+
+  //
+  // Given a string and an optional seed as an int, returns a 128 bit
+  // hash using the x64 flavor of MurmurHash3, as an unsigned hex.
+  //
+    var x64hash128 = function (key, seed) {
+      key = key || ''
+      seed = seed || 0
+      var remainder = key.length % 16
+      var bytes = key.length - remainder
+      var h1 = [0, seed]
+      var h2 = [0, seed]
+      var k1 = [0, 0]
+      var k2 = [0, 0]
+      var c1 = [0x87c37b91, 0x114253d5]
+      var c2 = [0x4cf5ad43, 0x2745937f]
+      for (var i = 0; i < bytes; i = i + 16) {
+        k1 = [((key.charCodeAt(i + 4) & 0xff)) | ((key.charCodeAt(i + 5) & 0xff) << 8) | ((key.charCodeAt(i + 6) & 0xff) << 16) | ((key.charCodeAt(i + 7) & 0xff) << 24), ((key.charCodeAt(i) & 0xff)) | ((key.charCodeAt(i + 1) & 0xff) << 8) | ((key.charCodeAt(i + 2) & 0xff) << 16) | ((key.charCodeAt(i + 3) & 0xff) << 24)]
+        k2 = [((key.charCodeAt(i + 12) & 0xff)) | ((key.charCodeAt(i + 13) & 0xff) << 8) | ((key.charCodeAt(i + 14) & 0xff) << 16) | ((key.charCodeAt(i + 15) & 0xff) << 24), ((key.charCodeAt(i + 8) & 0xff)) | ((key.charCodeAt(i + 9) & 0xff) << 8) | ((key.charCodeAt(i + 10) & 0xff) << 16) | ((key.charCodeAt(i + 11) & 0xff) << 24)]
+        k1 = x64Multiply(k1, c1)
+        k1 = x64Rotl(k1, 31)
+        k1 = x64Multiply(k1, c2)
+        h1 = x64Xor(h1, k1)
+        h1 = x64Rotl(h1, 27)
+        h1 = x64Add(h1, h2)
+        h1 = x64Add(x64Multiply(h1, [0, 5]), [0, 0x52dce729])
+        k2 = x64Multiply(k2, c2)
+        k2 = x64Rotl(k2, 33)
+        k2 = x64Multiply(k2, c1)
+        h2 = x64Xor(h2, k2)
+        h2 = x64Rotl(h2, 31)
+        h2 = x64Add(h2, h1)
+        h2 = x64Add(x64Multiply(h2, [0, 5]), [0, 0x38495ab5])
+      }
+      k1 = [0, 0]
+      k2 = [0, 0]
+      switch (remainder) {
+        case 15:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 14)], 48))
+        // fallthrough
+        case 14:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 13)], 40))
+        // fallthrough
+        case 13:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 12)], 32))
+        // fallthrough
+        case 12:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 11)], 24))
+        // fallthrough
+        case 11:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 10)], 16))
+        // fallthrough
+        case 10:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 9)], 8))
+        // fallthrough
+        case 9:
+          k2 = x64Xor(k2, [0, key.charCodeAt(i + 8)])
+          k2 = x64Multiply(k2, c2)
+          k2 = x64Rotl(k2, 33)
+          k2 = x64Multiply(k2, c1)
+          h2 = x64Xor(h2, k2)
+        // fallthrough
+        case 8:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 7)], 56))
+        // fallthrough
+        case 7:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 6)], 48))
+        // fallthrough
+        case 6:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 5)], 40))
+        // fallthrough
+        case 5:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 4)], 32))
+        // fallthrough
+        case 4:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 3)], 24))
+        // fallthrough
+        case 3:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 2)], 16))
+        // fallthrough
+        case 2:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 1)], 8))
+        // fallthrough
+        case 1:
+          k1 = x64Xor(k1, [0, key.charCodeAt(i)])
+          k1 = x64Multiply(k1, c1)
+          k1 = x64Rotl(k1, 31)
+          k1 = x64Multiply(k1, c2)
+          h1 = x64Xor(h1, k1)
+        // fallthrough
+      }
+      h1 = x64Xor(h1, [0, key.length])
+      h2 = x64Xor(h2, [0, key.length])
+      h1 = x64Add(h1, h2)
+      h2 = x64Add(h2, h1)
+      h1 = x64Fmix(h1)
+      h2 = x64Fmix(h2)
+      h1 = x64Add(h1, h2)
+      h2 = x64Add(h2, h1)
+      return ('00000000' + (h1[0] >>> 0).toString(16)).slice(-8) + ('00000000' + (h1[1] >>> 0).toString(16)).slice(-8) + ('00000000' + (h2[0] >>> 0).toString(16)).slice(-8) + ('00000000' + (h2[1] >>> 0).toString(16)).slice(-8)
+    }
+
+    var defaultOptions = {
+      preprocessor: null,
+      audio: {
+        timeout: 1000,
+          // On iOS 11, audio context can only be used in response to user interaction.
+          // We require users to explicitly enable audio fingerprinting on iOS 11.
+          // See https://stackoverflow.com/questions/46363048/onaudioprocess-not-called-on-ios11#46534088
+        excludeIOS11: true
+      },
+      fonts: {
+        swfContainerId: 'fingerprintjs2',
+        swfPath: 'flash/compiled/FontList.swf',
+        userDefinedFonts: [],
+        extendedJsFonts: false
+      },
+      screen: {
+         // To ensure consistent fingerprints when users rotate their mobile devices
+        detectScreenOrientation: true
+      },
+      plugins: {
+        sortPluginsFor: [/palemoon/i],
+        excludeIE: false
+      },
+      extraComponents: [],
+      excludes: {
+        // Unreliable on Windows, see https://github.com/Valve/fingerprintjs2/issues/375
+        'enumerateDevices': true,
+        // devicePixelRatio depends on browser zoom, and it's impossible to detect browser zoom
+        'pixelRatio': true,
+        // DNT depends on incognito mode for some browsers (Chrome) and it's impossible to detect incognito mode
+        'doNotTrack': true,
+        // uses js fonts already
+        'fontsFlash': true
+      },
+      NOT_AVAILABLE: 'not available',
+      ERROR: 'error',
+      EXCLUDED: 'excluded'
+    }
+
+    var each = function (obj, iterator) {
+      if (Array.prototype.forEach && obj.forEach === Array.prototype.forEach) {
+        obj.forEach(iterator)
+      } else if (obj.length === +obj.length) {
+        for (var i = 0, l = obj.length; i < l; i++) {
+          iterator(obj[i], i, obj)
+        }
+      } else {
+        for (var key in obj) {
+          if (obj.hasOwnProperty(key)) {
+            iterator(obj[key], key, obj)
+          }
+        }
+      }
+    }
+
+    var map = function (obj, iterator) {
+      var results = []
+      // Not using strict equality so that this acts as a
+      // shortcut to checking for `null` and `undefined`.
+      if (obj == null) {
+        return results
+      }
+      if (Array.prototype.map && obj.map === Array.prototype.map) { return obj.map(iterator) }
+      each(obj, function (value, index, list) {
+        results.push(iterator(value, index, list))
+      })
+      return results
+    }
+
+    var extendSoft = function (target, source) {
+      if (source == null) { return target }
+      var value
+      var key
+      for (key in source) {
+        value = source[key]
+        if (value != null && !(Object.prototype.hasOwnProperty.call(target, key))) {
+          target[key] = value
+        }
+      }
+      return target
+    }
+
+  // https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/enumerateDevices
+    var enumerateDevicesKey = function (done, options) {
+      if (!isEnumerateDevicesSupported()) {
+        return done(options.NOT_AVAILABLE)
+      }
+      navigator.mediaDevices.enumerateDevices().then(function (devices) {
+        done(devices.map(function (device) {
+          return 'id=' + device.deviceId + ';gid=' + device.groupId + ';' + device.kind + ';' + device.label
+        }))
+      })
+        .catch(function (error) {
+          done(error)
+        })
+    }
+
+    var isEnumerateDevicesSupported = function () {
+      return (navigator.mediaDevices && navigator.mediaDevices.enumerateDevices)
+    }
+  // Inspired by and based on https://github.com/cozylife/audio-fingerprint
+    var audioKey = function (done, options) {
+      var audioOptions = options.audio
+      if (audioOptions.excludeIOS11 && navigator.userAgent.match(/OS 11.+Version\/11.+Safari/)) {
+          // See comment for excludeUserAgent and https://stackoverflow.com/questions/46363048/onaudioprocess-not-called-on-ios11#46534088
+        return done(options.EXCLUDED)
+      }
+
+      var AudioContext = window.OfflineAudioContext || window.webkitOfflineAudioContext
+
+      if (AudioContext == null) {
+        return done(options.NOT_AVAILABLE)
+      }
+
+      var context = new AudioContext(1, 44100, 44100)
+
+      var oscillator = context.createOscillator()
+      oscillator.type = 'triangle'
+      oscillator.frequency.setValueAtTime(10000, context.currentTime)
+
+      var compressor = context.createDynamicsCompressor()
+      each([
+          ['threshold', -50],
+          ['knee', 40],
+          ['ratio', 12],
+          ['reduction', -20],
+          ['attack', 0],
+          ['release', 0.25]
+      ], function (item) {
+        if (compressor[item[0]] !== undefined && typeof compressor[item[0]].setValueAtTime === 'function') {
+          compressor[item[0]].setValueAtTime(item[1], context.currentTime)
+        }
+      })
+
+      oscillator.connect(compressor)
+      compressor.connect(context.destination)
+      oscillator.start(0)
+      context.startRendering()
+
+      var audioTimeoutId = setTimeout(function () {
+        console.warn('Audio fingerprint timed out. Please report bug at https://github.com/Valve/fingerprintjs2 with your user agent: "' + navigator.userAgent + '".')
+        context.oncomplete = function () {}
+        context = null
+        return done('audioTimeout')
+      }, audioOptions.timeout)
+
+      context.oncomplete = function (event) {
+        var fingerprint
+        try {
+          clearTimeout(audioTimeoutId)
+          fingerprint = event.renderedBuffer.getChannelData(0)
+              .slice(4500, 5000)
+              .reduce(function (acc, val) { return acc + Math.abs(val) }, 0)
+              .toString()
+          oscillator.disconnect()
+          compressor.disconnect()
+        } catch (error) {
+          done(error)
+          return
+        }
+        done(fingerprint)
+      }
+    }
+    var UserAgent = function (done) {
+      done(navigator.userAgent)
+    }
+    var languageKey = function (done, options) {
+      done(navigator.language || navigator.userLanguage || navigator.browserLanguage || navigator.systemLanguage || options.NOT_AVAILABLE)
+    }
+    var colorDepthKey = function (done, options) {
+      done(window.screen.colorDepth || options.NOT_AVAILABLE)
+    }
+    var deviceMemoryKey = function (done, options) {
+      done(navigator.deviceMemory || options.NOT_AVAILABLE)
+    }
+    var pixelRatioKey = function (done, options) {
+      done(window.devicePixelRatio || options.NOT_AVAILABLE)
+    }
+    var screenResolutionKey = function (done, options) {
+      done(getScreenResolution(options))
+    }
+    var getScreenResolution = function (options) {
+      var resolution = [window.screen.width, window.screen.height]
+      if (options.screen.detectScreenOrientation) {
+        resolution.sort().reverse()
+      }
+      return resolution
+    }
+    var availableScreenResolutionKey = function (done, options) {
+      done(getAvailableScreenResolution(options))
+    }
+    var getAvailableScreenResolution = function (options) {
+      if (window.screen.availWidth && window.screen.availHeight) {
+        var available = [window.screen.availHeight, window.screen.availWidth]
+        if (options.screen.detectScreenOrientation) {
+          available.sort().reverse()
+        }
+        return available
+      }
+      // headless browsers
+      return options.NOT_AVAILABLE
+    }
+    var timezoneOffset = function (done) {
+      done(new Date().getTimezoneOffset())
+    }
+    var timezone = function (done, options) {
+      if (window.Intl && window.Intl.DateTimeFormat) {
+        done(new window.Intl.DateTimeFormat().resolvedOptions().timeZone)
+        return
+      }
+      done(options.NOT_AVAILABLE)
+    }
+    var sessionStorageKey = function (done, options) {
+      done(hasSessionStorage(options))
+    }
+    var localStorageKey = function (done, options) {
+      done(hasLocalStorage(options))
+    }
+    var indexedDbKey = function (done, options) {
+      done(hasIndexedDB(options))
+    }
+    var addBehaviorKey = function (done) {
+        // body might not be defined at this point or removed programmatically
+      done(!!(document.body && document.body.addBehavior))
+    }
+    var openDatabaseKey = function (done) {
+      done(!!window.openDatabase)
+    }
+    var cpuClassKey = function (done, options) {
+      done(getNavigatorCpuClass(options))
+    }
+    var platformKey = function (done, options) {
+      done(getNavigatorPlatform(options))
+    }
+    var doNotTrackKey = function (done, options) {
+      done(getDoNotTrack(options))
+    }
+    var canvasKey = function (done, options) {
+      if (isCanvasSupported()) {
+        done(getCanvasFp(options))
+        return
+      }
+      done(options.NOT_AVAILABLE)
+    }
+    var webglKey = function (done, options) {
+      if (isWebGlSupported()) {
+        done(getWebglFp())
+        return
+      }
+      done(options.NOT_AVAILABLE)
+    }
+    var webglVendorAndRendererKey = function (done) {
+      if (isWebGlSupported()) {
+        done(getWebglVendorAndRenderer())
+        return
+      }
+      done()
+    }
+    var adBlockKey = function (done) {
+      done(getAdBlock())
+    }
+    var hasLiedLanguagesKey = function (done) {
+      done(getHasLiedLanguages())
+    }
+    var hasLiedResolutionKey = function (done) {
+      done(getHasLiedResolution())
+    }
+    var hasLiedOsKey = function (done) {
+      done(getHasLiedOs())
+    }
+    var hasLiedBrowserKey = function (done) {
+      done(getHasLiedBrowser())
+    }
+  // flash fonts (will increase fingerprinting time 20X to ~ 130-150ms)
+    var flashFontsKey = function (done, options) {
+      // we do flash if swfobject is loaded
+      if (!hasSwfObjectLoaded()) {
+        return done('swf object not loaded')
+      }
+      if (!hasMinFlashInstalled()) {
+        return done('flash not installed')
+      }
+      if (!options.fonts.swfPath) {
+        return done('missing options.fonts.swfPath')
+      }
+      loadSwfAndDetectFonts(function (fonts) {
+        done(fonts)
+      }, options)
+    }
+  // kudos to http://www.lalit.org/lab/javascript-css-font-detect/
+    var jsFontsKey = function (done, options) {
+        // a font will be compared against all the three default fonts.
+        // and if it doesn't match all 3 then that font is not available.
+      var baseFonts = ['monospace', 'sans-serif', 'serif']
+
+      var fontList = [
+        'Andale Mono', 'Arial', 'Arial Black', 'Arial Hebrew', 'Arial MT', 'Arial Narrow', 'Arial Rounded MT Bold', 'Arial Unicode MS',
+        'Bitstream Vera Sans Mono', 'Book Antiqua', 'Bookman Old Style',
+        'Calibri', 'Cambria', 'Cambria Math', 'Century', 'Century Gothic', 'Century Schoolbook', 'Comic Sans', 'Comic Sans MS', 'Consolas', 'Courier', 'Courier New',
+        'Geneva', 'Georgia',
+        'Helvetica', 'Helvetica Neue',
+        'Impact',
+        'Lucida Bright', 'Lucida Calligraphy', 'Lucida Console', 'Lucida Fax', 'LUCIDA GRANDE', 'Lucida Handwriting', 'Lucida Sans', 'Lucida Sans Typewriter', 'Lucida Sans Unicode',
+        'Microsoft Sans Serif', 'Monaco', 'Monotype Corsiva', 'MS Gothic', 'MS Outlook', 'MS PGothic', 'MS Reference Sans Serif', 'MS Sans Serif', 'MS Serif', 'MYRIAD', 'MYRIAD PRO',
+        'Palatino', 'Palatino Linotype',
+        'Segoe Print', 'Segoe Script', 'Segoe UI', 'Segoe UI Light', 'Segoe UI Semibold', 'Segoe UI Symbol',
+        'Tahoma', 'Times', 'Times New Roman', 'Times New Roman PS', 'Trebuchet MS',
+        'Verdana', 'Wingdings', 'Wingdings 2', 'Wingdings 3'
+      ]
+
+      if (options.fonts.extendedJsFonts) {
+        var extendedFontList = [
+          'Abadi MT Condensed Light', 'Academy Engraved LET', 'ADOBE CASLON PRO', 'Adobe Garamond', 'ADOBE GARAMOND PRO', 'Agency FB', 'Aharoni', 'Albertus Extra Bold', 'Albertus Medium', 'Algerian', 'Amazone BT', 'American Typewriter',
+          'American Typewriter Condensed', 'AmerType Md BT', 'Andalus', 'Angsana New', 'AngsanaUPC', 'Antique Olive', 'Aparajita', 'Apple Chancery', 'Apple Color Emoji', 'Apple SD Gothic Neo', 'Arabic Typesetting', 'ARCHER',
+          'ARNO PRO', 'Arrus BT', 'Aurora Cn BT', 'AvantGarde Bk BT', 'AvantGarde Md BT', 'AVENIR', 'Ayuthaya', 'Bandy', 'Bangla Sangam MN', 'Bank Gothic', 'BankGothic Md BT', 'Baskerville',
+          'Baskerville Old Face', 'Batang', 'BatangChe', 'Bauer Bodoni', 'Bauhaus 93', 'Bazooka', 'Bell MT', 'Bembo', 'Benguiat Bk BT', 'Berlin Sans FB', 'Berlin Sans FB Demi', 'Bernard MT Condensed', 'BernhardFashion BT', 'BernhardMod BT', 'Big Caslon', 'BinnerD',
+          'Blackadder ITC', 'BlairMdITC TT', 'Bodoni 72', 'Bodoni 72 Oldstyle', 'Bodoni 72 Smallcaps', 'Bodoni MT', 'Bodoni MT Black', 'Bodoni MT Condensed', 'Bodoni MT Poster Compressed',
+          'Bookshelf Symbol 7', 'Boulder', 'Bradley Hand', 'Bradley Hand ITC', 'Bremen Bd BT', 'Britannic Bold', 'Broadway', 'Browallia New', 'BrowalliaUPC', 'Brush Script MT', 'Californian FB', 'Calisto MT', 'Calligrapher', 'Candara',
+          'CaslonOpnface BT', 'Castellar', 'Centaur', 'Cezanne', 'CG Omega', 'CG Times', 'Chalkboard', 'Chalkboard SE', 'Chalkduster', 'Charlesworth', 'Charter Bd BT', 'Charter BT', 'Chaucer',
+          'ChelthmITC Bk BT', 'Chiller', 'Clarendon', 'Clarendon Condensed', 'CloisterBlack BT', 'Cochin', 'Colonna MT', 'Constantia', 'Cooper Black', 'Copperplate', 'Copperplate Gothic', 'Copperplate Gothic Bold',
+          'Copperplate Gothic Light', 'CopperplGoth Bd BT', 'Corbel', 'Cordia New', 'CordiaUPC', 'Cornerstone', 'Coronet', 'Cuckoo', 'Curlz MT', 'DaunPenh', 'Dauphin', 'David', 'DB LCD Temp', 'DELICIOUS', 'Denmark',
+          'DFKai-SB', 'Didot', 'DilleniaUPC', 'DIN', 'DokChampa', 'Dotum', 'DotumChe', 'Ebrima', 'Edwardian Script ITC', 'Elephant', 'English 111 Vivace BT', 'Engravers MT', 'EngraversGothic BT', 'Eras Bold ITC', 'Eras Demi ITC', 'Eras Light ITC', 'Eras Medium ITC',
+          'EucrosiaUPC', 'Euphemia', 'Euphemia UCAS', 'EUROSTILE', 'Exotc350 Bd BT', 'FangSong', 'Felix Titling', 'Fixedsys', 'FONTIN', 'Footlight MT Light', 'Forte',
+          'FrankRuehl', 'Fransiscan', 'Freefrm721 Blk BT', 'FreesiaUPC', 'Freestyle Script', 'French Script MT', 'FrnkGothITC Bk BT', 'Fruitger', 'FRUTIGER',
+          'Futura', 'Futura Bk BT', 'Futura Lt BT', 'Futura Md BT', 'Futura ZBlk BT', 'FuturaBlack BT', 'Gabriola', 'Galliard BT', 'Gautami', 'Geeza Pro', 'Geometr231 BT', 'Geometr231 Hv BT', 'Geometr231 Lt BT', 'GeoSlab 703 Lt BT',
+          'GeoSlab 703 XBd BT', 'Gigi', 'Gill Sans', 'Gill Sans MT', 'Gill Sans MT Condensed', 'Gill Sans MT Ext Condensed Bold', 'Gill Sans Ultra Bold', 'Gill Sans Ultra Bold Condensed', 'Gisha', 'Gloucester MT Extra Condensed', 'GOTHAM', 'GOTHAM BOLD',
+          'Goudy Old Style', 'Goudy Stout', 'GoudyHandtooled BT', 'GoudyOLSt BT', 'Gujarati Sangam MN', 'Gulim', 'GulimChe', 'Gungsuh', 'GungsuhChe', 'Gurmukhi MN', 'Haettenschweiler', 'Harlow Solid Italic', 'Harrington', 'Heather', 'Heiti SC', 'Heiti TC', 'HELV',
+          'Herald', 'High Tower Text', 'Hiragino Kaku Gothic ProN', 'Hiragino Mincho ProN', 'Hoefler Text', 'Humanst 521 Cn BT', 'Humanst521 BT', 'Humanst521 Lt BT', 'Imprint MT Shadow', 'Incised901 Bd BT', 'Incised901 BT',
+          'Incised901 Lt BT', 'INCONSOLATA', 'Informal Roman', 'Informal011 BT', 'INTERSTATE', 'IrisUPC', 'Iskoola Pota', 'JasmineUPC', 'Jazz LET', 'Jenson', 'Jester', 'Jokerman', 'Juice ITC', 'Kabel Bk BT', 'Kabel Ult BT', 'Kailasa', 'KaiTi', 'Kalinga', 'Kannada Sangam MN',
+          'Kartika', 'Kaufmann Bd BT', 'Kaufmann BT', 'Khmer UI', 'KodchiangUPC', 'Kokila', 'Korinna BT', 'Kristen ITC', 'Krungthep', 'Kunstler Script', 'Lao UI', 'Latha', 'Leelawadee', 'Letter Gothic', 'Levenim MT', 'LilyUPC', 'Lithograph', 'Lithograph Light', 'Long Island',
+          'Lydian BT', 'Magneto', 'Maiandra GD', 'Malayalam Sangam MN', 'Malgun Gothic',
+          'Mangal', 'Marigold', 'Marion', 'Marker Felt', 'Market', 'Marlett', 'Matisse ITC', 'Matura MT Script Capitals', 'Meiryo', 'Meiryo UI', 'Microsoft Himalaya', 'Microsoft JhengHei', 'Microsoft New Tai Lue', 'Microsoft PhagsPa', 'Microsoft Tai Le',
+          'Microsoft Uighur', 'Microsoft YaHei', 'Microsoft Yi Baiti', 'MingLiU', 'MingLiU_HKSCS', 'MingLiU_HKSCS-ExtB', 'MingLiU-ExtB', 'Minion', 'Minion Pro', 'Miriam', 'Miriam Fixed', 'Mistral', 'Modern', 'Modern No. 20', 'Mona Lisa Solid ITC TT', 'Mongolian Baiti',
+          'MONO', 'MoolBoran', 'Mrs Eaves', 'MS LineDraw', 'MS Mincho', 'MS PMincho', 'MS Reference Specialty', 'MS UI Gothic', 'MT Extra', 'MUSEO', 'MV Boli',
+          'Nadeem', 'Narkisim', 'NEVIS', 'News Gothic', 'News GothicMT', 'NewsGoth BT', 'Niagara Engraved', 'Niagara Solid', 'Noteworthy', 'NSimSun', 'Nyala', 'OCR A Extended', 'Old Century', 'Old English Text MT', 'Onyx', 'Onyx BT', 'OPTIMA', 'Oriya Sangam MN',
+          'OSAKA', 'OzHandicraft BT', 'Palace Script MT', 'Papyrus', 'Parchment', 'Party LET', 'Pegasus', 'Perpetua', 'Perpetua Titling MT', 'PetitaBold', 'Pickwick', 'Plantagenet Cherokee', 'Playbill', 'PMingLiU', 'PMingLiU-ExtB',
+          'Poor Richard', 'Poster', 'PosterBodoni BT', 'PRINCETOWN LET', 'Pristina', 'PTBarnum BT', 'Pythagoras', 'Raavi', 'Rage Italic', 'Ravie', 'Ribbon131 Bd BT', 'Rockwell', 'Rockwell Condensed', 'Rockwell Extra Bold', 'Rod', 'Roman', 'Sakkal Majalla',
+          'Santa Fe LET', 'Savoye LET', 'Sceptre', 'Script', 'Script MT Bold', 'SCRIPTINA', 'Serifa', 'Serifa BT', 'Serifa Th BT', 'ShelleyVolante BT', 'Sherwood',
+          'Shonar Bangla', 'Showcard Gothic', 'Shruti', 'Signboard', 'SILKSCREEN', 'SimHei', 'Simplified Arabic', 'Simplified Arabic Fixed', 'SimSun', 'SimSun-ExtB', 'Sinhala Sangam MN', 'Sketch Rockwell', 'Skia', 'Small Fonts', 'Snap ITC', 'Snell Roundhand', 'Socket',
+          'Souvenir Lt BT', 'Staccato222 BT', 'Steamer', 'Stencil', 'Storybook', 'Styllo', 'Subway', 'Swis721 BlkEx BT', 'Swiss911 XCm BT', 'Sylfaen', 'Synchro LET', 'System', 'Tamil Sangam MN', 'Technical', 'Teletype', 'Telugu Sangam MN', 'Tempus Sans ITC',
+          'Terminal', 'Thonburi', 'Traditional Arabic', 'Trajan', 'TRAJAN PRO', 'Tristan', 'Tubular', 'Tunga', 'Tw Cen MT', 'Tw Cen MT Condensed', 'Tw Cen MT Condensed Extra Bold',
+          'TypoUpright BT', 'Unicorn', 'Univers', 'Univers CE 55 Medium', 'Univers Condensed', 'Utsaah', 'Vagabond', 'Vani', 'Vijaya', 'Viner Hand ITC', 'VisualUI', 'Vivaldi', 'Vladimir Script', 'Vrinda', 'Westminster', 'WHITNEY', 'Wide Latin',
+          'ZapfEllipt BT', 'ZapfHumnst BT', 'ZapfHumnst Dm BT', 'Zapfino', 'Zurich BlkEx BT', 'Zurich Ex BT', 'ZWAdobeF']
+        fontList = fontList.concat(extendedFontList)
+      }
+
+      fontList = fontList.concat(options.fonts.userDefinedFonts)
+
+        // remove duplicate fonts
+      fontList = fontList.filter(function (font, position) {
+        return fontList.indexOf(font) === position
+      })
+
+        // we use m or w because these two characters take up the maximum width.
+        // And we use a LLi so that the same matching fonts can get separated
+      var testString = 'mmmmmmmmmmlli'
+
+        // we test using 72px font size, we may use any size. I guess larger the better.
+      var testSize = '72px'
+
+      var h = document.getElementsByTagName('body')[0]
+
+        // div to load spans for the base fonts
+      var baseFontsDiv = document.createElement('div')
+
+        // div to load spans for the fonts to detect
+      var fontsDiv = document.createElement('div')
+
+      var defaultWidth = {}
+      var defaultHeight = {}
+
+        // creates a span where the fonts will be loaded
+      var createSpan = function () {
+        var s = document.createElement('span')
+          /*
+           * We need this css as in some weird browser this
+           * span elements shows up for a microSec which creates a
+           * bad user experience
+           */
+        s.style.position = 'absolute'
+        s.style.left = '-9999px'
+        s.style.fontSize = testSize
+
+          // css font reset to reset external styles
+        s.style.fontStyle = 'normal'
+        s.style.fontWeight = 'normal'
+        s.style.letterSpacing = 'normal'
+        s.style.lineBreak = 'auto'
+        s.style.lineHeight = 'normal'
+        s.style.textTransform = 'none'
+        s.style.textAlign = 'left'
+        s.style.textDecoration = 'none'
+        s.style.textShadow = 'none'
+        s.style.whiteSpace = 'normal'
+        s.style.wordBreak = 'normal'
+        s.style.wordSpacing = 'normal'
+
+        s.innerHTML = testString
+        return s
+      }
+
+        // creates a span and load the font to detect and a base font for fallback
+      var createSpanWithFonts = function (fontToDetect, baseFont) {
+        var s = createSpan()
+        s.style.fontFamily = "'" + fontToDetect + "'," + baseFont
+        return s
+      }
+
+        // creates spans for the base fonts and adds them to baseFontsDiv
+      var initializeBaseFontsSpans = function () {
+        var spans = []
+        for (var index = 0, length = baseFonts.length; index < length; index++) {
+          var s = createSpan()
+          s.style.fontFamily = baseFonts[index]
+          baseFontsDiv.appendChild(s)
+          spans.push(s)
+        }
+        return spans
+      }
+
+        // creates spans for the fonts to detect and adds them to fontsDiv
+      var initializeFontsSpans = function () {
+        var spans = {}
+        for (var i = 0, l = fontList.length; i < l; i++) {
+          var fontSpans = []
+          for (var j = 0, numDefaultFonts = baseFonts.length; j < numDefaultFonts; j++) {
+            var s = createSpanWithFonts(fontList[i], baseFonts[j])
+            fontsDiv.appendChild(s)
+            fontSpans.push(s)
+          }
+          spans[fontList[i]] = fontSpans // Stores {fontName : [spans for that font]}
+        }
+        return spans
+      }
+
+        // checks if a font is available
+      var isFontAvailable = function (fontSpans) {
+        var detected = false
+        for (var i = 0; i < baseFonts.length; i++) {
+          detected = (fontSpans[i].offsetWidth !== defaultWidth[baseFonts[i]] || fontSpans[i].offsetHeight !== defaultHeight[baseFonts[i]])
+          if (detected) {
+            return detected
+          }
+        }
+        return detected
+      }
+
+        // create spans for base fonts
+      var baseFontsSpans = initializeBaseFontsSpans()
+
+        // add the spans to the DOM
+      h.appendChild(baseFontsDiv)
+
+        // get the default width for the three base fonts
+      for (var index = 0, length = baseFonts.length; index < length; index++) {
+        defaultWidth[baseFonts[index]] = baseFontsSpans[index].offsetWidth // width for the default font
+        defaultHeight[baseFonts[index]] = baseFontsSpans[index].offsetHeight // height for the default font
+      }
+
+        // create spans for fonts to detect
+      var fontsSpans = initializeFontsSpans()
+
+        // add all the spans to the DOM
+      h.appendChild(fontsDiv)
+
+        // check available fonts
+      var available = []
+      for (var i = 0, l = fontList.length; i < l; i++) {
+        if (isFontAvailable(fontsSpans[fontList[i]])) {
+          available.push(fontList[i])
+        }
+      }
+
+        // remove spans from DOM
+      h.removeChild(fontsDiv)
+      h.removeChild(baseFontsDiv)
+      done(available)
+    }
+    var pluginsComponent = function (done, options) {
+      if (isIE()) {
+        if (!options.plugins.excludeIE) {
+          done(getIEPlugins(options))
+        } else {
+          done(options.EXCLUDED)
+        }
+      } else {
+        done(getRegularPlugins(options))
+      }
+    }
+    var getRegularPlugins = function (options) {
+      if (navigator.plugins == null) {
+        return options.NOT_AVAILABLE
+      }
+
+      var plugins = []
+        // plugins isn't defined in Node envs.
+      for (var i = 0, l = navigator.plugins.length; i < l; i++) {
+        if (navigator.plugins[i]) { plugins.push(navigator.plugins[i]) }
+      }
+
+        // sorting plugins only for those user agents, that we know randomize the plugins
+        // every time we try to enumerate them
+      if (pluginsShouldBeSorted(options)) {
+        plugins = plugins.sort(function (a, b) {
+          if (a.name > b.name) { return 1 }
+          if (a.name < b.name) { return -1 }
+          return 0
+        })
+      }
+      return map(plugins, function (p) {
+        var mimeTypes = map(p, function (mt) {
+          return [mt.type, mt.suffixes]
+        })
+        return [p.name, p.description, mimeTypes]
+      })
+    }
+    var getIEPlugins = function (options) {
+      var result = []
+      if ((Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(window, 'ActiveXObject')) || ('ActiveXObject' in window)) {
+        var names = [
+          'AcroPDF.PDF', // Adobe PDF reader 7+
+          'Adodb.Stream',
+          'AgControl.AgControl', // Silverlight
+          'DevalVRXCtrl.DevalVRXCtrl.1',
+          'MacromediaFlashPaper.MacromediaFlashPaper',
+          'Msxml2.DOMDocument',
+          'Msxml2.XMLHTTP',
+          'PDF.PdfCtrl', // Adobe PDF reader 6 and earlier, brrr
+          'QuickTime.QuickTime', // QuickTime
+          'QuickTimeCheckObject.QuickTimeCheck.1',
+          'RealPlayer',
+          'RealPlayer.RealPlayer(tm) ActiveX Control (32-bit)',
+          'RealVideo.RealVideo(tm) ActiveX Control (32-bit)',
+          'Scripting.Dictionary',
+          'SWCtl.SWCtl', // ShockWave player
+          'Shell.UIHelper',
+          'ShockwaveFlash.ShockwaveFlash', // flash plugin
+          'Skype.Detection',
+          'TDCCtl.TDCCtl',
+          'WMPlayer.OCX', // Windows media player
+          'rmocx.RealPlayer G2 Control',
+          'rmocx.RealPlayer G2 Control.1'
+        ]
+          // starting to detect plugins in IE
+        result = map(names, function (name) {
+          try {
+              // eslint-disable-next-line no-new
+            new window.ActiveXObject(name)
+            return name
+          } catch (e) {
+            return options.ERROR
+          }
+        })
+      } else {
+        result.push(options.NOT_AVAILABLE)
+      }
+      if (navigator.plugins) {
+        result = result.concat(getRegularPlugins(options))
+      }
+      return result
+    }
+    var pluginsShouldBeSorted = function (options) {
+      var should = false
+      for (var i = 0, l = options.plugins.sortPluginsFor.length; i < l; i++) {
+        var re = options.plugins.sortPluginsFor[i]
+        if (navigator.userAgent.match(re)) {
+          should = true
+          break
+        }
+      }
+      return should
+    }
+    var touchSupportKey = function (done) {
+      done(getTouchSupport())
+    }
+    var hardwareConcurrencyKey = function (done, options) {
+      done(getHardwareConcurrency(options))
+    }
+    var hasSessionStorage = function (options) {
+      try {
+        return !!window.sessionStorage
+      } catch (e) {
+        return options.ERROR // SecurityError when referencing it means it exists
+      }
+    }
+
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=781447
+    var hasLocalStorage = function (options) {
+      try {
+        return !!window.localStorage
+      } catch (e) {
+        return options.ERROR // SecurityError when referencing it means it exists
+      }
+    }
+    var hasIndexedDB = function (options) {
+      try {
+        return !!window.indexedDB
+      } catch (e) {
+        return options.ERROR // SecurityError when referencing it means it exists
+      }
+    }
+    var getHardwareConcurrency = function (options) {
+      if (navigator.hardwareConcurrency) {
+        return navigator.hardwareConcurrency
+      }
+      return options.NOT_AVAILABLE
+    }
+    var getNavigatorCpuClass = function (options) {
+      return navigator.cpuClass || options.NOT_AVAILABLE
+    }
+    var getNavigatorPlatform = function (options) {
+      if (navigator.platform) {
+        return navigator.platform
+      } else {
+        return options.NOT_AVAILABLE
+      }
+    }
+    var getDoNotTrack = function (options) {
+      if (navigator.doNotTrack) {
+        return navigator.doNotTrack
+      } else if (navigator.msDoNotTrack) {
+        return navigator.msDoNotTrack
+      } else if (window.doNotTrack) {
+        return window.doNotTrack
+      } else {
+        return options.NOT_AVAILABLE
+      }
+    }
+  // This is a crude and primitive touch screen detection.
+  // It's not possible to currently reliably detect the  availability of a touch screen
+  // with a JS, without actually subscribing to a touch event.
+  // http://www.stucox.com/blog/you-cant-detect-a-touchscreen/
+  // https://github.com/Modernizr/Modernizr/issues/548
+  // method returns an array of 3 values:
+  // maxTouchPoints, the success or failure of creating a TouchEvent,
+  // and the availability of the 'ontouchstart' property
+
+    var getTouchSupport = function () {
+      var maxTouchPoints = 0
+      var touchEvent
+      if (typeof navigator.maxTouchPoints !== 'undefined') {
+        maxTouchPoints = navigator.maxTouchPoints
+      } else if (typeof navigator.msMaxTouchPoints !== 'undefined') {
+        maxTouchPoints = navigator.msMaxTouchPoints
+      }
+      try {
+        document.createEvent('TouchEvent')
+        touchEvent = true
+      } catch (_) {
+        touchEvent = false
+      }
+      var touchStart = 'ontouchstart' in window
+      return [maxTouchPoints, touchEvent, touchStart]
+    }
+  // https://www.browserleaks.com/canvas#how-does-it-work
+
+    var getCanvasFp = function (options) {
+      var result = []
+        // Very simple now, need to make it more complex (geo shapes etc)
+      var canvas = document.createElement('canvas')
+      canvas.width = 2000
+      canvas.height = 200
+      canvas.style.display = 'inline'
+      var ctx = canvas.getContext('2d')
+        // detect browser support of canvas winding
+        // http://blogs.adobe.com/webplatform/2013/01/30/winding-rules-in-canvas/
+        // https://github.com/Modernizr/Modernizr/blob/master/feature-detects/canvas/winding.js
+      ctx.rect(0, 0, 10, 10)
+      ctx.rect(2, 2, 6, 6)
+      result.push('canvas winding:' + ((ctx.isPointInPath(5, 5, 'evenodd') === false) ? 'yes' : 'no'))
+
+      ctx.textBaseline = 'alphabetic'
+      ctx.fillStyle = '#f60'
+      ctx.fillRect(125, 1, 62, 20)
+      ctx.fillStyle = '#069'
+        // https://github.com/Valve/fingerprintjs2/issues/66
+      if (options.dontUseFakeFontInCanvas) {
+        ctx.font = '11pt Arial'
+      } else {
+        ctx.font = '11pt no-real-font-123'
+      }
+      ctx.fillText('Cwm fjordbank glyphs vext quiz, \ud83d\ude03', 2, 15)
+      ctx.fillStyle = 'rgba(102, 204, 0, 0.2)'
+      ctx.font = '18pt Arial'
+      ctx.fillText('Cwm fjordbank glyphs vext quiz, \ud83d\ude03', 4, 45)
+
+        // canvas blending
+        // http://blogs.adobe.com/webplatform/2013/01/28/blending-features-in-canvas/
+        // http://jsfiddle.net/NDYV8/16/
+      ctx.globalCompositeOperation = 'multiply'
+      ctx.fillStyle = 'rgb(255,0,255)'
+      ctx.beginPath()
+      ctx.arc(50, 50, 50, 0, Math.PI * 2, true)
+      ctx.closePath()
+      ctx.fill()
+      ctx.fillStyle = 'rgb(0,255,255)'
+      ctx.beginPath()
+      ctx.arc(100, 50, 50, 0, Math.PI * 2, true)
+      ctx.closePath()
+      ctx.fill()
+      ctx.fillStyle = 'rgb(255,255,0)'
+      ctx.beginPath()
+      ctx.arc(75, 100, 50, 0, Math.PI * 2, true)
+      ctx.closePath()
+      ctx.fill()
+      ctx.fillStyle = 'rgb(255,0,255)'
+        // canvas winding
+        // http://blogs.adobe.com/webplatform/2013/01/30/winding-rules-in-canvas/
+        // http://jsfiddle.net/NDYV8/19/
+      ctx.arc(75, 75, 75, 0, Math.PI * 2, true)
+      ctx.arc(75, 75, 25, 0, Math.PI * 2, true)
+      ctx.fill('evenodd')
+
+      if (canvas.toDataURL) { result.push('canvas fp:' + canvas.toDataURL()) }
+      return result
+    }
+    var getWebglFp = function () {
+      var gl
+      var fa2s = function (fa) {
+        gl.clearColor(0.0, 0.0, 0.0, 1.0)
+        gl.enable(gl.DEPTH_TEST)
+        gl.depthFunc(gl.LEQUAL)
+        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT)
+        return '[' + fa[0] + ', ' + fa[1] + ']'
+      }
+      var maxAnisotropy = function (gl) {
+        var ext = gl.getExtension('EXT_texture_filter_anisotropic') || gl.getExtension('WEBKIT_EXT_texture_filter_anisotropic') || gl.getExtension('MOZ_EXT_texture_filter_anisotropic')
+        if (ext) {
+          var anisotropy = gl.getParameter(ext.MAX_TEXTURE_MAX_ANISOTROPY_EXT)
+          if (anisotropy === 0) {
+            anisotropy = 2
+          }
+          return anisotropy
+        } else {
+          return null
+        }
+      }
+
+      gl = getWebglCanvas()
+      if (!gl) { return null }
+        // WebGL fingerprinting is a combination of techniques, found in MaxMind antifraud script & Augur fingerprinting.
+        // First it draws a gradient object with shaders and convers the image to the Base64 string.
+        // Then it enumerates all WebGL extensions & capabilities and appends them to the Base64 string, resulting in a huge WebGL string, potentially very unique on each device
+        // Since iOS supports webgl starting from version 8.1 and 8.1 runs on several graphics chips, the results may be different across ios devices, but we need to verify it.
+      var result = []
+      var vShaderTemplate = 'attribute vec2 attrVertex;varying vec2 varyinTexCoordinate;uniform vec2 uniformOffset;void main(){varyinTexCoordinate=attrVertex+uniformOffset;gl_Position=vec4(attrVertex,0,1);}'
+      var fShaderTemplate = 'precision mediump float;varying vec2 varyinTexCoordinate;void main() {gl_FragColor=vec4(varyinTexCoordinate,0,1);}'
+      var vertexPosBuffer = gl.createBuffer()
+      gl.bindBuffer(gl.ARRAY_BUFFER, vertexPosBuffer)
+      var vertices = new Float32Array([-0.2, -0.9, 0, 0.4, -0.26, 0, 0, 0.732134444, 0])
+      gl.bufferData(gl.ARRAY_BUFFER, vertices, gl.STATIC_DRAW)
+      vertexPosBuffer.itemSize = 3
+      vertexPosBuffer.numItems = 3
+      var program = gl.createProgram()
+      var vshader = gl.createShader(gl.VERTEX_SHADER)
+      gl.shaderSource(vshader, vShaderTemplate)
+      gl.compileShader(vshader)
+      var fshader = gl.createShader(gl.FRAGMENT_SHADER)
+      gl.shaderSource(fshader, fShaderTemplate)
+      gl.compileShader(fshader)
+      gl.attachShader(program, vshader)
+      gl.attachShader(program, fshader)
+      gl.linkProgram(program)
+      gl.useProgram(program)
+      program.vertexPosAttrib = gl.getAttribLocation(program, 'attrVertex')
+      program.offsetUniform = gl.getUniformLocation(program, 'uniformOffset')
+      gl.enableVertexAttribArray(program.vertexPosArray)
+      gl.vertexAttribPointer(program.vertexPosAttrib, vertexPosBuffer.itemSize, gl.FLOAT, !1, 0, 0)
+      gl.uniform2f(program.offsetUniform, 1, 1)
+      gl.drawArrays(gl.TRIANGLE_STRIP, 0, vertexPosBuffer.numItems)
+      try {
+        result.push(gl.canvas.toDataURL())
+      } catch (e) {
+          /* .toDataURL may be absent or broken (blocked by extension) */
+      }
+      result.push('extensions:' + (gl.getSupportedExtensions() || []).join(';'))
+      result.push('webgl aliased line width range:' + fa2s(gl.getParameter(gl.ALIASED_LINE_WIDTH_RANGE)))
+      result.push('webgl aliased point size range:' + fa2s(gl.getParameter(gl.ALIASED_POINT_SIZE_RANGE)))
+      result.push('webgl alpha bits:' + gl.getParameter(gl.ALPHA_BITS))
+      result.push('webgl antialiasing:' + (gl.getContextAttributes().antialias ? 'yes' : 'no'))
+      result.push('webgl blue bits:' + gl.getParameter(gl.BLUE_BITS))
+      result.push('webgl depth bits:' + gl.getParameter(gl.DEPTH_BITS))
+      result.push('webgl green bits:' + gl.getParameter(gl.GREEN_BITS))
+      result.push('webgl max anisotropy:' + maxAnisotropy(gl))
+      result.push('webgl max combined texture image units:' + gl.getParameter(gl.MAX_COMBINED_TEXTURE_IMAGE_UNITS))
+      result.push('webgl max cube map texture size:' + gl.getParameter(gl.MAX_CUBE_MAP_TEXTURE_SIZE))
+      result.push('webgl max fragment uniform vectors:' + gl.getParameter(gl.MAX_FRAGMENT_UNIFORM_VECTORS))
+      result.push('webgl max render buffer size:' + gl.getParameter(gl.MAX_RENDERBUFFER_SIZE))
+      result.push('webgl max texture image units:' + gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS))
+      result.push('webgl max texture size:' + gl.getParameter(gl.MAX_TEXTURE_SIZE))
+      result.push('webgl max varying vectors:' + gl.getParameter(gl.MAX_VARYING_VECTORS))
+      result.push('webgl max vertex attribs:' + gl.getParameter(gl.MAX_VERTEX_ATTRIBS))
+      result.push('webgl max vertex texture image units:' + gl.getParameter(gl.MAX_VERTEX_TEXTURE_IMAGE_UNITS))
+      result.push('webgl max vertex uniform vectors:' + gl.getParameter(gl.MAX_VERTEX_UNIFORM_VECTORS))
+      result.push('webgl max viewport dims:' + fa2s(gl.getParameter(gl.MAX_VIEWPORT_DIMS)))
+      result.push('webgl red bits:' + gl.getParameter(gl.RED_BITS))
+      result.push('webgl renderer:' + gl.getParameter(gl.RENDERER))
+      result.push('webgl shading language version:' + gl.getParameter(gl.SHADING_LANGUAGE_VERSION))
+      result.push('webgl stencil bits:' + gl.getParameter(gl.STENCIL_BITS))
+      result.push('webgl vendor:' + gl.getParameter(gl.VENDOR))
+      result.push('webgl version:' + gl.getParameter(gl.VERSION))
+
+      try {
+          // Add the unmasked vendor and unmasked renderer if the debug_renderer_info extension is available
+        var extensionDebugRendererInfo = gl.getExtension('WEBGL_debug_renderer_info')
+        if (extensionDebugRendererInfo) {
+          result.push('webgl unmasked vendor:' + gl.getParameter(extensionDebugRendererInfo.UNMASKED_VENDOR_WEBGL))
+          result.push('webgl unmasked renderer:' + gl.getParameter(extensionDebugRendererInfo.UNMASKED_RENDERER_WEBGL))
+        }
+      } catch (e) { /* squelch */ }
+
+      if (!gl.getShaderPrecisionFormat) {
+        return result
+      }
+
+      each(['FLOAT', 'INT'], function (numType) {
+        each(['VERTEX', 'FRAGMENT'], function (shader) {
+          each(['HIGH', 'MEDIUM', 'LOW'], function (numSize) {
+            each(['precision', 'rangeMin', 'rangeMax'], function (key) {
+              var format = gl.getShaderPrecisionFormat(gl[shader + '_SHADER'], gl[numSize + '_' + numType])[key]
+              if (key !== 'precision') {
+                key = 'precision ' + key
+              }
+              var line = ['webgl ', shader.toLowerCase(), ' shader ', numSize.toLowerCase(), ' ', numType.toLowerCase(), ' ', key, ':', format].join('')
+              result.push(line)
+            })
+          })
+        })
+      })
+      return result
+    }
+    var getWebglVendorAndRenderer = function () {
+        /* This a subset of the WebGL fingerprint with a lot of entropy, while being reasonably browser-independent */
+      try {
+        var glContext = getWebglCanvas()
+        var extensionDebugRendererInfo = glContext.getExtension('WEBGL_debug_renderer_info')
+        return glContext.getParameter(extensionDebugRendererInfo.UNMASKED_VENDOR_WEBGL) + '~' + glContext.getParameter(extensionDebugRendererInfo.UNMASKED_RENDERER_WEBGL)
+      } catch (e) {
+        return null
+      }
+    }
+    var getAdBlock = function () {
+      var ads = document.createElement('div')
+      ads.innerHTML = '&nbsp;'
+      ads.className = 'adsbox'
+      var result = false
+      try {
+          // body may not exist, that's why we need try/catch
+        document.body.appendChild(ads)
+        result = document.getElementsByClassName('adsbox')[0].offsetHeight === 0
+        document.body.removeChild(ads)
+      } catch (e) {
+        result = false
+      }
+      return result
+    }
+    var getHasLiedLanguages = function () {
+        // We check if navigator.language is equal to the first language of navigator.languages
+      if (typeof navigator.languages !== 'undefined') {
+        try {
+          var firstLanguages = navigator.languages[0].substr(0, 2)
+          if (firstLanguages !== navigator.language.substr(0, 2)) {
+            return true
+          }
+        } catch (err) {
+          return true
+        }
+      }
+      return false
+    }
+    var getHasLiedResolution = function () {
+      return window.screen.width < window.screen.availWidth || window.screen.height < window.screen.availHeight
+    }
+    var getHasLiedOs = function () {
+      var userAgent = navigator.userAgent.toLowerCase()
+      var oscpu = navigator.oscpu
+      var platform = navigator.platform.toLowerCase()
+      var os
+        // We extract the OS from the user agent (respect the order of the if else if statement)
+      if (userAgent.indexOf('windows phone') >= 0) {
+        os = 'Windows Phone'
+      } else if (userAgent.indexOf('win') >= 0) {
+        os = 'Windows'
+      } else if (userAgent.indexOf('android') >= 0) {
+        os = 'Android'
+      } else if (userAgent.indexOf('linux') >= 0) {
+        os = 'Linux'
+      } else if (userAgent.indexOf('iphone') >= 0 || userAgent.indexOf('ipad') >= 0) {
+        os = 'iOS'
+      } else if (userAgent.indexOf('mac') >= 0) {
+        os = 'Mac'
+      } else {
+        os = 'Other'
+      }
+        // We detect if the person uses a mobile device
+      var mobileDevice = (('ontouchstart' in window) ||
+          (navigator.maxTouchPoints > 0) ||
+          (navigator.msMaxTouchPoints > 0))
+
+      if (mobileDevice && os !== 'Windows Phone' && os !== 'Android' && os !== 'iOS' && os !== 'Other') {
+        return true
+      }
+
+        // We compare oscpu with the OS extracted from the UA
+      if (typeof oscpu !== 'undefined') {
+        oscpu = oscpu.toLowerCase()
+        if (oscpu.indexOf('win') >= 0 && os !== 'Windows' && os !== 'Windows Phone') {
+          return true
+        } else if (oscpu.indexOf('linux') >= 0 && os !== 'Linux' && os !== 'Android') {
+          return true
+        } else if (oscpu.indexOf('mac') >= 0 && os !== 'Mac' && os !== 'iOS') {
+          return true
+        } else if ((oscpu.indexOf('win') === -1 && oscpu.indexOf('linux') === -1 && oscpu.indexOf('mac') === -1) !== (os === 'Other')) {
+          return true
+        }
+      }
+
+        // We compare platform with the OS extracted from the UA
+      if (platform.indexOf('win') >= 0 && os !== 'Windows' && os !== 'Windows Phone') {
+        return true
+      } else if ((platform.indexOf('linux') >= 0 || platform.indexOf('android') >= 0 || platform.indexOf('pike') >= 0) && os !== 'Linux' && os !== 'Android') {
+        return true
+      } else if ((platform.indexOf('mac') >= 0 || platform.indexOf('ipad') >= 0 || platform.indexOf('ipod') >= 0 || platform.indexOf('iphone') >= 0) && os !== 'Mac' && os !== 'iOS') {
+        return true
+      } else if ((platform.indexOf('win') === -1 && platform.indexOf('linux') === -1 && platform.indexOf('mac') === -1) !== (os === 'Other')) {
+        return true
+      }
+
+      return typeof navigator.plugins === 'undefined' && os !== 'Windows' && os !== 'Windows Phone'
+    }
+    var getHasLiedBrowser = function () {
+      var userAgent = navigator.userAgent.toLowerCase()
+      var productSub = navigator.productSub
+
+        // we extract the browser from the user agent (respect the order of the tests)
+      var browser
+      if (userAgent.indexOf('firefox') >= 0) {
+        browser = 'Firefox'
+      } else if (userAgent.indexOf('opera') >= 0 || userAgent.indexOf('opr') >= 0) {
+        browser = 'Opera'
+      } else if (userAgent.indexOf('chrome') >= 0) {
+        browser = 'Chrome'
+      } else if (userAgent.indexOf('safari') >= 0) {
+        browser = 'Safari'
+      } else if (userAgent.indexOf('trident') >= 0) {
+        browser = 'Internet Explorer'
+      } else {
+        browser = 'Other'
+      }
+
+      if ((browser === 'Chrome' || browser === 'Safari' || browser === 'Opera') && productSub !== '20030107') {
+        return true
+      }
+
+        // eslint-disable-next-line no-eval
+      var tempRes = eval.toString().length
+      if (tempRes === 37 && browser !== 'Safari' && browser !== 'Firefox' && browser !== 'Other') {
+        return true
+      } else if (tempRes === 39 && browser !== 'Internet Explorer' && browser !== 'Other') {
+        return true
+      } else if (tempRes === 33 && browser !== 'Chrome' && browser !== 'Opera' && browser !== 'Other') {
+        return true
+      }
+
+        // We create an error to see how it is handled
+      var errFirefox
+      try {
+          // eslint-disable-next-line no-throw-literal
+        throw 'a'
+      } catch (err) {
+        try {
+          err.toSource()
+          errFirefox = true
+        } catch (errOfErr) {
+          errFirefox = false
+        }
+      }
+      return errFirefox && browser !== 'Firefox' && browser !== 'Other'
+    }
+    var isCanvasSupported = function () {
+      var elem = document.createElement('canvas')
+      return !!(elem.getContext && elem.getContext('2d'))
+    }
+    var isWebGlSupported = function () {
+        // code taken from Modernizr
+      if (!isCanvasSupported()) {
+        return false
+      }
+
+      var glContext = getWebglCanvas()
+      return !!window.WebGLRenderingContext && !!glContext
+    }
+    var isIE = function () {
+      if (navigator.appName === 'Microsoft Internet Explorer') {
+        return true
+      } else if (navigator.appName === 'Netscape' && /Trident/.test(navigator.userAgent)) { // IE 11
+        return true
+      }
+      return false
+    }
+    var hasSwfObjectLoaded = function () {
+      return typeof window.swfobject !== 'undefined'
+    }
+    var hasMinFlashInstalled = function () {
+      return window.swfobject.hasFlashPlayerVersion('9.0.0')
+    }
+    var addFlashDivNode = function (options) {
+      var node = document.createElement('div')
+      node.setAttribute('id', options.fonts.swfContainerId)
+      document.body.appendChild(node)
+    }
+    var loadSwfAndDetectFonts = function (done, options) {
+      var hiddenCallback = '___fp_swf_loaded'
+      window[hiddenCallback] = function (fonts) {
+        done(fonts)
+      }
+      var id = options.fonts.swfContainerId
+      addFlashDivNode()
+      var flashvars = { onReady: hiddenCallback }
+      var flashparams = { allowScriptAccess: 'always', menu: 'false' }
+      window.swfobject.embedSWF(options.fonts.swfPath, id, '1', '1', '9.0.0', false, flashvars, flashparams, {})
+    }
+    var getWebglCanvas = function () {
+      var canvas = document.createElement('canvas')
+      var gl = null
+      try {
+        gl = canvas.getContext('webgl') || canvas.getContext('experimental-webgl')
+      } catch (e) { /* squelch */ }
+      if (!gl) { gl = null }
+      return gl
+    }
+
+    var components = [
+      {key: 'userAgent', getData: UserAgent},
+      {key: 'language', getData: languageKey},
+      {key: 'colorDepth', getData: colorDepthKey},
+      {key: 'deviceMemory', getData: deviceMemoryKey},
+      {key: 'pixelRatio', getData: pixelRatioKey},
+      {key: 'hardwareConcurrency', getData: hardwareConcurrencyKey},
+      {key: 'screenResolution', getData: screenResolutionKey},
+      {key: 'availableScreenResolution', getData: availableScreenResolutionKey},
+      {key: 'timezoneOffset', getData: timezoneOffset},
+      {key: 'timezone', getData: timezone},
+      {key: 'sessionStorage', getData: sessionStorageKey},
+      {key: 'localStorage', getData: localStorageKey},
+      {key: 'indexedDb', getData: indexedDbKey},
+      {key: 'addBehavior', getData: addBehaviorKey},
+      {key: 'openDatabase', getData: openDatabaseKey},
+      {key: 'cpuClass', getData: cpuClassKey},
+      {key: 'platform', getData: platformKey},
+      {key: 'doNotTrack', getData: doNotTrackKey},
+      {key: 'plugins', getData: pluginsComponent},
+      {key: 'canvas', getData: canvasKey},
+      {key: 'webgl', getData: webglKey},
+      {key: 'webglVendorAndRenderer', getData: webglVendorAndRendererKey},
+      {key: 'adBlock', getData: adBlockKey},
+      {key: 'hasLiedLanguages', getData: hasLiedLanguagesKey},
+      {key: 'hasLiedResolution', getData: hasLiedResolutionKey},
+      {key: 'hasLiedOs', getData: hasLiedOsKey},
+      {key: 'hasLiedBrowser', getData: hasLiedBrowserKey},
+      {key: 'touchSupport', getData: touchSupportKey},
+      {key: 'fonts', getData: jsFontsKey, pauseBefore: true},
+      {key: 'fontsFlash', getData: flashFontsKey, pauseBefore: true},
+      {key: 'audio', getData: audioKey},
+      {key: 'enumerateDevices', getData: enumerateDevicesKey}
+    ]
+
+    var Fingerprint2 = function (options) {
+      throw new Error("'new Fingerprint()' is deprecated, see https://github.com/Valve/fingerprintjs2#upgrade-guide-from-182-to-200")
+    }
+
+    Fingerprint2.get = function (options, callback) {
+      if (!callback) {
+        callback = options
+        options = {}
+      } else if (!options) {
+        options = {}
+      }
+      extendSoft(options, defaultOptions)
+      options.components = options.extraComponents.concat(components)
+
+      var keys = {
+        data: [],
+        addPreprocessedComponent: function (key, value) {
+          if (typeof options.preprocessor === 'function') {
+            value = options.preprocessor(key, value)
+          }
+          keys.data.push({key: key, value: value})
+        }
+      }
+
+      var i = -1
+      var chainComponents = function (alreadyWaited) {
+        i += 1
+        if (i >= options.components.length) { // on finish
+          callback(keys.data)
+          return
+        }
+        var component = options.components[i]
+
+        if (options.excludes[component.key]) {
+          chainComponents(false) // skip
+          return
+        }
+
+        if (!alreadyWaited && component.pauseBefore) {
+          i -= 1
+          setTimeout(function () {
+            chainComponents(true)
+          }, 1)
+          return
+        }
+
+        try {
+          component.getData(function (value) {
+            keys.addPreprocessedComponent(component.key, value)
+            chainComponents(false)
+          }, options)
+        } catch (error) {
+          // main body error
+          keys.addPreprocessedComponent(component.key, String(error))
+          chainComponents(false)
+        }
+      }
+
+      chainComponents(false)
+    }
+
+    Fingerprint2.getPromise = function (options) {
+      return new Promise(function (resolve, reject) {
+        Fingerprint2.get(options, resolve)
+      })
+    }
+
+    Fingerprint2.getV18 = function (options, callback) {
+      if (callback == null) {
+        callback = options
+        options = {}
+      }
+      return Fingerprint2.get(options, function (components) {
+        var newComponents = []
+        for (var i = 0; i < components.length; i++) {
+          var component = components[i]
+          if (component.value === (options.NOT_AVAILABLE || 'not available')) {
+            newComponents.push({key: component.key, value: 'unknown'})
+          } else if (component.key === 'plugins') {
+            newComponents.push({key: 'plugins',
+              value: map(component.value, function (p) {
+                var mimeTypes = map(p[2], function (mt) {
+                  if (mt.join) { return mt.join('~') }
+                  return mt
+                }).join(',')
+                return [p[0], p[1], mimeTypes].join('::')
+              })})
+          } else if (['canvas', 'webgl'].indexOf(component.key) !== -1) {
+            newComponents.push({key: component.key, value: component.value.join('~')})
+          } else if (['sessionStorage', 'localStorage', 'indexedDb', 'addBehavior', 'openDatabase'].indexOf(component.key) !== -1) {
+            if (component.value) {
+              newComponents.push({key: component.key, value: 1})
+            } else {
+              // skip
+              continue
+            }
+          } else {
+            if (component.value) {
+              newComponents.push(component.value.join ? {key: component.key, value: component.value.join(';')} : component)
+            } else {
+              newComponents.push({key: component.key, value: component.value})
+            }
+          }
+        }
+        var murmur = x64hash128(map(newComponents, function (component) { return component.value }).join('~~~'), 31)
+        callback(murmur, newComponents)
+      })
+    }
+
+    Fingerprint2.x64hash128 = x64hash128
+    Fingerprint2.VERSION = '2.0.6'
+    return Fingerprint2
+  })
+/**
+ * This is responsible for syncing of Telemetry
+ * @class TelemetrySyncManager
+ * @author Manjunath Davanam <manjunathd@ilimi.in>
+ * @author Krushanu Mohapatra <Krushanu.Mohapatra@tarento.com>
+ */
+
+var TelemetrySyncManager = {
+
+    /**
+     * This is the telemetry data for the perticular stage.
+     * @member {object} _teleData
+     * @memberof TelemetryPlugin
+     */
+    _teleData: [],
+    init: function() {
+        var instance = this;
+        document.addEventListener('TelemetryEvent', this.sendTelemetry);
+    },
+    sendTelemetry: function(event) {
+        var telemetryEvent = event.detail;
+        console.log("Telemetry Events ", JSON.stringify(telemetryEvent));
+        var instance = TelemetrySyncManager;
+        sessionStorage.setItem("FP_T", window.EkTelemetry.fingerPrintId);
+        instance._teleData.push(Object.assign({}, telemetryEvent));
+        if ((telemetryEvent.eid.toUpperCase() === "END") || (instance._teleData.length >= Telemetry.config.batchsize)) {
+            TelemetrySyncManager.syncEvents();
+        }
+    },
+    updateEventStack: function(events) {
+        TelemetrySyncManager._teleData = TelemetrySyncManager._teleData.concat(events);
+    },
+    syncEvents: function() {
+        var Telemetry = EkTelemetry || Telemetry;
+        var instance = TelemetrySyncManager;
+        var telemetryData = instance._teleData.splice(0, Telemetry.config.batchsize);
+        var telemetryObj = {
+            "id": "ekstep.telemetry",
+            "ver": Telemetry._version,
+            "ets": (new Date()).getTime(),
+            "events": telemetryData
+        };
+        var headersParam = {};
+        if ('undefined' != typeof Telemetry.config.authtoken)
+            headersParam["Authorization"] = 'Bearer ' + Telemetry.config.authtoken;
+
+        var fullPath = Telemetry.config.host + Telemetry.config.apislug + Telemetry.config.endpoint;
+        headersParam['dataType'] = 'json';
+        headersParam["Content-Type"] = "application/json";
+        jQuery.ajax({
+            url: fullPath,
+            type: "POST",
+            headers: headersParam,
+            data: JSON.stringify(telemetryObj)
+        }).done(function(resp) {
+            console.log("Telemetry API success", resp);
+        }).fail(function(error, textStatus, errorThrown) {
+            instance.updateEventStack(telemetryData);
+            if (error.status == 403) {
+                console.error("Authentication error: ", error);
+            } else {
+                console.log("Error while Telemetry sync to server: ", error);
+            }
+        });
+    }
+}
+if (typeof document != 'undefined') {
+    TelemetrySyncManager.init();
+}
+/**
+ * Telemetry V3 Library
+ * @author Manjunath Davanam <manjunathd@ilimi.in>
+ * @author Akash Gupta <Akash.Gupta@tarento.com>
+ */
+
+// To support for node server environment
+if (typeof require === "function") {
+    var Ajv = require('ajv')
+}
+
+
+var libraryDispatcher = {
+    dispatch: function(event) {
+        if (typeof document != 'undefined') {
+            //To Support for external user who ever lisenting on this 'TelemetryEvent' event.
+            // IT  WORKS ONLY FOR CLIENT SIDE
+            document.dispatchEvent(new CustomEvent('TelemetryEvent', { detail: event }));
+        } else {
+            console.info("Library dispatcher supports only for client side.");
+        }
+    }
+};
+
+
+var Telemetry = (function() {
+    this.telemetry = function() {};
+    var instance = function() {};
+    var telemetryInstance = this;
+    this.telemetry.initialized = false;
+    this.telemetry.config = {};
+    this.telemetry._version = "3.0";
+    this.telemetry.fingerPrintId = undefined;
+    this.dispatcher = libraryDispatcher;
+    this._defaultValue = {
+            uid: "anonymous",
+            authtoken: "",
+            batchsize: 20,
+            host: "https://api.ekstep.in",
+            endpoint: "/data/v3/telemetry",
+            apislug: "/action",
+        },
+        this.telemetryEnvelop = {
+            "eid": "",
+            "ets": "",
+            "ver": "",
+            "mid": '',
+            "actor": {},
+            "context": {},
+            "object": {},
+            "tags": [],
+            "edata": ""
+        }
+    this._globalContext = {
+        "channel": 'in.ekstep',
+        "pdata": { id: "in.ekstep", ver: "1.0", pid: "" },
+        "env": "contentplayer",
+        "sid": "",
+        "did": "",
+        "cdata": [],
+        "rollup": {}
+    };
+    this.runningEnv = 'client';
+    this.enableValidation = false;
+    this._globalObject = {};
+    this.startData = [];
+    this.ajv = new Ajv({ schemas: telemetrySchema });
+
+    /**
+     * Which is used to initialize the telemetry event
+     * @param  {object} config - Configurations for the telemetry lib to initialize the service. " Example: config = { batchsize:10,host:"" } "
+     */
+    this.telemetry.initialize = function(config) {
+        instance.init(config);
+    }
+
+    /**
+     * Which is used to start and initialize the telemetry event.
+     * If the telemetry is already initialzed then it will trigger only start event.
+     * @param  {object} config     [Telemetry lib configurations]
+     * @param  {string} contentId  [Content Identifier]
+     * @param  {string} contentVer [Content version]
+     * @param  {object} data       [Can have userAgent,device spec object]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.start = function(config, contentId, contentVer, data, options) {
+        data.duration = data.duration || (((new Date()).getTime()) * 0.001); // Converting duration miliSeconds to seconds
+        if (contentId && contentVer) {
+            telemetryInstance._globalObject.id = contentId;
+            telemetryInstance._globalObject.ver = contentVer;
+        }
+
+        if (!Telemetry.initialized && config) {
+            instance.init(config, contentId, contentVer)
+
+        }
+        instance.updateValues(options);
+        var startEventObj = instance.getEvent('START', data);
+        instance._dispatch(startEventObj)
+        telemetryInstance.startData.push(JSON.parse(JSON.stringify(startEventObj)));
+    }
+
+    /**
+     * Which is used to log the impression telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.impression = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('IMPRESSION', data));
+    }
+
+    /**
+     * Which is used to log the interact telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.interact = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('INTERACT', data));
+    }
+
+    /**
+     * Which is used to log the assess telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.assess = function(data, options) {
+        instance.updateValues(options);
+        assessEvent = instance.getEvent('ASSESS', data);
+        // This code will replace current version with the new version number, if present in options.
+        if (options && options.eventVer) assessEvent.ver = options.eventVer;
+        instance._dispatch(assessEvent);
+    }
+
+    /**
+     * Which is used to log the response telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.response = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('RESPONSE', data));
+    }
+
+    /**
+     * Which is used to log the interrupt telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.interrupt = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('INTERRUPT', data));
+    }
+
+    /**
+     * Which is used to log the feedback telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.feedback = function(data, options) {
+        var eksData = {
+            "rating": data.rating,
+            "comments": data.comments || ''
+        }
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('FEEDBACK', eksData));
+    }
+
+    /**
+     * Which is used to log the share telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.share = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('SHARE', data));
+    }
+
+    /**
+     * Which is used to log the audit telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.audit = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('AUDIT', data));
+    }
+
+    /**
+     * Which is used to log the error telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.error = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('ERROR', data));
+    }
+
+    /**
+     * Which is used to log the heartbeat telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.heartbeat = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('HEARTBEAT', data));
+    }
+
+    /**
+     * Which is used to log the log event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.log = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('LOG', data));
+    }
+
+    /**
+     * Which is used to log the search event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.search = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('SEARCH', data));
+    }
+
+    /**
+     * Which is used to log the metrics event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.metrics = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('METRICS', data));
+    }
+
+    /**
+     * Which is used to log the exdata event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.exdata = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('EXDATA', data));
+    }
+
+    /**
+     * Which is used to log the summary event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.summary = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('SUMMARY', data));
+    }
+
+    /**
+     * Which is used to log the end telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.end = function(data, options) {
+        if (telemetryInstance.startData.length) {
+            var startEventObj = telemetryInstance.startData.pop();
+            data.duration = ((new Date()).getTime() - startEventObj.ets) * 0.001; // Converting duration miliSeconds to seconds
+            instance.updateValues(options);
+            instance._dispatch(instance.getEvent('END', data));
+        } else {
+            console.info("Please invoke start before invoking end event.")
+        }
+    }
+
+    /**
+     * Which is used to know the whether telemetry is initialized or not.
+     * @return {Boolean}
+     */
+    this.telemetry.isInitialized = function() {
+        return Telemetry.initialized;
+    }
+
+    /**
+     * Which is used to reset the current context
+     * @param  {object} context [Context value]
+     */
+    this.telemetry.resetContext = function(context) {
+        telemetryInstance._currentContext = context || {};
+    }
+
+    /**
+     * Which is used to reset the current object value.
+     * @param  {object} object [Object value]
+     */
+    this.telemetry.resetObject = function(object) {
+            telemetryInstance._currentObject = object || {};
+        },
+
+        /**
+         * Which is used to reset the current actor value.
+         * @param  {object} object [Object value]
+         */
+        this.telemetry.resetActor = function(actor) {
+            telemetryInstance._currentActor = actor || {};
+        }
+
+
+    /**
+     * Which is used to reset the current actor value.
+     * @param  {object} object [Object value]
+     */
+    this.telemetry.resetTags = function(tags) {
+        telemetryInstance._currentTags = tags || [];
+    }
+
+    this.telemetry.syncEvents = function() {
+        if (typeof TelemetrySyncManager != 'undefined') {
+            TelemetrySyncManager.syncEvents();
+        }
+    }
+
+    /**
+     * Which is used to initialize the telemetry in globally.
+     * @param  {object} config     [Telemetry configurations]
+     * @param  {string} contentId  [Identifier value]
+     * @param  {string} contentVer [Version]
+     * @param  {object} type       [object type]
+     */
+    instance.init = function(config, contentId, contentVer) {
+        if (Telemetry.initialized) {
+            console.log("Telemetry is already initialized..");
+            return;
+        }!config && (config = {})
+        contentId && (telemetryInstance._globalObject.id = contentId);
+        contentVer && (telemetryInstance._globalObject.ver = contentVer);
+        config.runningEnv && (telemetryInstance.runningEnv = config.runningEnv);
+        if (typeof config.enableValidation !== 'undefined') {
+            telemetryInstance.enableValidation = config.enableValidation;
+        }
+        config.batchsize = config.batchsize ? (config.batchsize > 1000 ? 1000 : config.batchsize) : _defaultValue.batchsize;
+        Telemetry.config = Object.assign(_defaultValue, config);
+        Telemetry.initialized = true;
+        telemetryInstance.dispatcher = Telemetry.config.dispatcher ? Telemetry.config.dispatcher : libraryDispatcher;
+        instance.updateConfigurations(config);
+        console.info("Telemetry is initialized.")
+    }
+
+    /**
+     * Which is used to dispatch a telemetry events.
+     * @param  {object} message [Telemetry event object]
+     */
+    instance._dispatch = function(message) {
+        message.mid = message.eid + ':' + CryptoJS.MD5(JSON.stringify(message)).toString();
+        if (telemetryInstance.enableValidation) {
+            var validate = ajv.getSchema('http://api.ekstep.org/telemetry/' + message.eid.toLowerCase())
+            var valid = validate(message)
+            if (!valid) {
+                console.error('Invalid ' + message.eid + ' Event: ' + ajv.errorsText(validate.errors))
+                return
+            }
+        }
+        if (telemetryInstance.runningEnv === 'client') {
+            if (!message.context.did) {
+                if (!Telemetry.fingerPrintId) {
+                    Telemetry.getFingerPrint(function(result, components) {
+                        message.context.did = result;
+                        message.actor.id = instance.getActorId(message.actor.id, result);
+                        Telemetry.fingerPrintId = result;
+                        dispatcher.dispatch(message);
+                    })
+                } else {
+                    message.context.did = Telemetry.fingerPrintId;
+                    message.actor.id = instance.getActorId(message.actor.id, Telemetry.fingerPrintId);
+                    dispatcher.dispatch(message);
+                }
+            } else {
+                message.actor.id = instance.getActorId(message.actor.id, message.context.did);
+                dispatcher.dispatch(message);
+            }
+        } else {
+            dispatcher.dispatch(message);
+        }
+    }
+
+    /**
+     * Which is used to get set Actor id as device id if actor id is 'anonymous'
+     * @param  {string} actorId
+     * @param  {string} deviceId    [DeviceId]
+     * @return {string} [actor id based on value of the actor came from input]
+     */
+    instance.getActorId = function (actorId,deviceId) {
+        if(!actorId || actorId === 'anonymous'){
+            return deviceId;
+        }else{
+            return actorId
+        }
+    }
+
+    /**
+     * Which is used to get the telemetry envelop data
+     * @param  {string} eventId [Name of the event]
+     * @param  {object} data    [Event data]
+     * @return {object}         [Telemetry envelop data]
+     */
+    instance.getEvent = function(eventId, data) {
+        telemetryInstance.telemetryEnvelop.eid = eventId;
+        // timeDiff (in sec) is diff of server date and local date
+        telemetryInstance.telemetryEnvelop.ets = (new Date()).getTime() + ((Telemetry.config.timeDiff*1000) || 0);
+        telemetryInstance.telemetryEnvelop.ver = Telemetry._version;
+        telemetryInstance.telemetryEnvelop.mid = '';
+        telemetryInstance.telemetryEnvelop.actor = Object.assign({}, { "id": Telemetry.config.uid || 'anonymous', "type": 'User' }, instance.getUpdatedValue('actor'));
+        telemetryInstance.telemetryEnvelop.context = Object.assign({}, instance.getGlobalContext(), instance.getUpdatedValue('context'));
+        telemetryInstance.telemetryEnvelop.object = Object.assign({}, instance.getGlobalObject(), instance.getUpdatedValue('object'));
+        telemetryInstance.telemetryEnvelop.tags = Object.assign([], Telemetry.config.tags, instance.getUpdatedValue('tags'));
+        telemetryInstance.telemetryEnvelop.edata = data;
+        return telemetryInstance.telemetryEnvelop;
+    }
+
+    /**
+     * Which is used to assing to globalObject and globalContext value from the telemetry configurations.
+     * @param  {object} config [Telemetry configurations]
+     */
+    instance.updateConfigurations = function(config) {
+        config.object && (telemetryInstance._globalObject = config.object);
+        config.channel && (telemetryInstance._globalContext.channel = config.channel);
+        config.env && (telemetryInstance._globalContext.env = config.env);
+        config.rollup && (telemetryInstance._globalContext.rollup = config.rollup);
+        config.sid && (telemetryInstance._globalContext.sid = config.sid);
+        config.did && (telemetryInstance._globalContext.did = config.did);
+        config.cdata && (telemetryInstance._globalContext.cdata = config.cdata);
+        config.pdata && (telemetryInstance._globalContext.pdata = config.pdata);
+
+
+    }
+
+    /**
+     * Which is used to get the current updated global context value.
+     * @return {object}
+     */
+    instance.getGlobalContext = function() {
+        return telemetryInstance._globalContext;
+    }
+
+    /**
+     * Which is used to get the current global object value.
+     * @return {object}
+     */
+    instance.getGlobalObject = function() {
+        return telemetryInstance._globalObject;
+    }
+
+    /**
+     * Which is used to update the both context and object vlaue.
+     * For any event explicitly context and object value can be passed.
+     * @param  {object} context [Context value object]
+     * @param  {object} object  [Object value]
+     */
+    instance.updateValues = function(options) {
+        if (options) {
+            options.context && (telemetryInstance._currentContext = options.context);
+            options.object && (telemetryInstance._currentObject = options.object);
+            options.actor && (telemetryInstance._currentActor = options.actor);
+            options.tags && (telemetryInstance._currentTags = options.tags);
+            options.runningEnv && (telemetryInstance.runningEnv = options.runningEnv);
+        }
+    }
+
+    /**
+     * Which is used to get the value of 'context','actor','object'
+     * @param  {string} key [ Name of object which we is need to get ]
+     * @return {object}
+     */
+    instance.getUpdatedValue = function(key) {
+        switch (key.toLowerCase()) {
+            case 'context':
+                return telemetryInstance._currentContext || {};
+                break;
+            case 'object':
+                return telemetryInstance._currentObject || {};
+                break;
+            case 'actor':
+                return telemetryInstance._currentActor || {};
+                break;
+            case 'tags':
+                return telemetryInstance._currentTags || [];
+                break;
+        }
+    }
+
+    /**
+     * Which is used to support for lower end deviecs.
+     * If any of the devices which is not supporting ECMAScript 6 version
+     */
+    instance.objectAssign = function() {
+        Object.assign = function(target) {
+            'use strict';
+            if (target == null) {
+                throw new TypeError('Cannot convert undefined or null to object');
+            }
+
+            target = Object(target);
+            for (var index = 1; index < arguments.length; index++) {
+                var source = arguments[index];
+                if (source != null) {
+                    for (var key in source) {
+                        if (Object.prototype.hasOwnProperty.call(source, key)) {
+                            target[key] = source[key];
+                        }
+                    }
+                }
+            }
+            return target;
+        }
+    }
+    var FPoptions = {
+        preprocessor: function (key, value) {
+            if (key == "userAgent") {
+                var parser = new UAParser(value); // https://github.com/faisalman/ua-parser-js
+                var userAgentMinusVersion = parser.getOS().name + ' ' + parser.getBrowser().name
+                return userAgentMinusVersion
+            }
+            return value
+        },
+        audio: {
+            timeout: 1000,
+            // On iOS 11, audio context can only be used in response to user interaction.
+            // We require users to explicitly enable audio fingerprinting on iOS 11.
+            // See https://stackoverflow.com/questions/46363048/onaudioprocess-not-called-on-ios11#46534088
+            excludeIOS11: true
+        },
+        fonts: {
+            swfContainerId: 'fingerprintjs2',
+            swfPath: 'flash/compiled/FontList.swf',
+            userDefinedFonts: [],
+            extendedJsFonts: false
+        },
+        screen: {
+            // To ensure consistent fingerprints when users rotate their mobile devices
+            detectScreenOrientation: true
+        },
+        plugins: {
+            sortPluginsFor: [/palemoon/i],
+            excludeIE: false
+        },
+        extraComponents: [],
+        excludes: {
+            // Unreliable on Windows, see https://github.com/Valve/fingerprintjs2/issues/375
+            'enumerateDevices': true,
+            // devicePixelRatio depends on browser zoom, and it's impossible to detect browser zoom
+            'pixelRatio': true,
+            // DNT depends on incognito mode for some browsers (Chrome) and it's impossible to detect incognito mode
+            'doNotTrack': true,
+            // uses js fonts already
+            'fontsFlash': true,
+            'canvas': true,
+            'screenResolution': true,
+            'availableScreenResolution': true,
+            'touchSupport': true,
+            'plugins': true,
+            'webgl': true,
+            'audio': true,
+            'language': true,
+            'deviceMemory': true
+        },
+        NOT_AVAILABLE: 'not available',
+        ERROR: 'error',
+        EXCLUDED: 'excluded'
+    }
+    this.telemetry.getFingerPrint = function (cb) {
+        Fingerprint2.getV18(FPoptions, function (result, components) {
+            if (cb) cb(result, components)
+        })
+    }
+    if (typeof Object.assign != 'function') {
+        instance.objectAssign();
+    }
+
+    return this.telemetry;
+})();
+
+/**
+ * Name space which is being fallowed
+ * @type {[type]}
+ */
+
+EkTelemetry = $t = Telemetry;
+
+
+
+/**
+ * To support for the node backEnd, So any node developer can import this telemetry lib.
+ */
+if (typeof module != 'undefined') {
+    module.exports = Telemetry;
+}
+
+let pdataId = "";
+if(window.location.origin.indexOf("diksha.gov.in") >= 0){
+  pdataId = "prod.diksha.portal";
+}else if(window.location.origin.indexOf("staging.ntp.net.in") >= 0){
+  pdataId = "staging.diksha.portal";
+}else{
+  pdataId = "preprod.diksha.portal";
+}
+
+let curUrlObj = window.location;
+let client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+if(client_id.toLowerCase() === 'android'){
+  let pdata = JSON.parse((new URLSearchParams(curUrlObj.search)).get('pdata'));
+  if (pdata && pdata['id']) {
+    pdataId = pdata['id'];
+  }
+}
+
+// var tenant_telemetryservice = {};
+//(function () {
+  window.__landing_page_config = {
+    "hostURL": window.location.origin,
+    "telemetry": {
+      "pdata": {
+        "id": pdataId,
+        "ver": "3.5.0",
+        "pid": "sunbird-portal"
+      }
+    }
+  }
+  var tenantId, tenantInfo, orgInfo;
+  var hostURL = window.__landing_page_config.hostURL || null;
+  if (hostURL.indexOf("merge.") > 0) {
+    var url = (window.location.protocol) + "//" + hostURL.slice(hostURL.indexOf("merge.") + 6, hostURL.length);
+    hostURL = url;
+  }
+  function OnLoad() {
+    tenantId = sessionStorage.getItem("tenantSlug");
+    getOrgInfo(tenantId).done(function () {
+      initTelemetryService();
+      logLoginImpressionEvent("init");
+    });
+  }
+
+  function getOrgInfo(id) {
+    return $.ajax({
+      method: "POST",
+      url: hostURL + "/api/org/v1/search",
+      data: JSON.stringify({
+        request: {
+          filters: {
+            isRootOrg: true,
+            slug: id || 'ntp'
+          }
+        }
+      }),
+      contentType: "application/json"
+    }).done(function (response) {
+      if (response && response.responseCode === "OK") {
+        orgInfo = response.result.response.content[0];
+        //orgInfo.hashTagId = orgInfo.hashTagId;
+      }
+    });
+    //orgInfo.hashTagId = orgInfo.hashTagId;
+  };
+
+  function getAnonymousUserConfig() {
+    var endpoint = "/data/v1/telemetry"
+    return {
+      pdata: window.__landing_page_config.telemetry.pdata,
+      endpoint: endpoint,
+      apislug: "/content",
+      host: hostURL,
+      uid: 'anonymous',
+      sid: window.uuidv1(),
+      channel: orgInfo.hashTagId,
+      env: 'public'
+    }
+  }
+
+  function initTelemetryService() {
+    var config = getAnonymousUserConfig();
+    window.EkTelemetry.initialize(config);
+  }
+
+  function logLoginImpressionEvent(impressionType) {
+    Telemetry.config.batchsize = 1;
+    var options = {
+      context: {
+        env: 'public',
+        channel: orgInfo.hashTagId,
+        uid: 'anonymous',
+        cdata: [],
+        rollup: getRollupData([orgInfo.hashTagId])
+      },
+      object: {},
+      tags: [orgInfo.hashTagId]
+    };
+    var edata = {
+      type: "view",
+      pageid: "login",
+      subtype: impressionType,
+      uri: encodeURI(window.location.href),
+      visits: []
+    };
+    window.EkTelemetry.impression(edata, options);
+  }
+
+  function logInteractEvent(interactid) {
+    var options = {
+      context: {
+        env: 'public',
+        channel: orgInfo.hashTagId,
+        uid: 'anonymous',
+        cdata: [],
+        rollup: getRollupData([orgInfo.hashTagId])
+      },
+      object: {},
+      tags: [orgInfo.hashTagId]
+    };
+    var edata = {
+      id: interactid,
+      type: "click",
+      pageid: 'login'
+    };
+    window.EkTelemetry.interact(edata, options);
+  };
+
+  function getRollupData(orgIds) {
+    var rollup = {};
+    orgIds.forEach(function (el, index) {
+      rollup['l' + (index + 1)] = el;
+    })
+    return rollup;
+  }
+
+  function doLogin(e) {
+    e.preventDefault();
+    logInteractEvent("login");
+    logLoginImpressionEvent("pageexit");
+    setTimeout(function () {
+      $("#kc-form-login").submit();
+    }, 500);
+    return false;
+  }
+
+  $("body").ready(function ($) {
+    $(".loginButton").click(function (e) {
+      e.preventDefault();
+      logInteractEvent("login");
+      logLoginImpressionEvent("pageexit");
+      setTimeout(function () {
+        $("#kc-form-login").submit();
+      }, 500);
+
+      return false;
+    })
+
+    // onclick="redirect('/google/auth')"
+    $(".googleSignInButton").click(function (e) {
+      e.preventDefault();
+      logInteractEvent("google-signin");
+      redirect('/google/auth');
+      // setTimeout(function(){
+      //   $("#kc-form-login").submit();
+      //  }, 500);
+
+      return false;
+    })
+
+    //onclick="handleSsoEvent()"
+    $(".stateSignInButton").click(function (e) {
+      e.preventDefault();
+      logInteractEvent("state-signin");
+      handleSsoEvent();
+    })
+  });
+
+  //google-signin
+  //state-signin
+
+  function getRollupData(orgIds) {
+    var rollup = {};
+    orgIds.forEach(function (el, index) {
+      rollup['l' + (index + 1)] = el;
+    })
+    return rollup;
+  }
+
+  // On page load
+  OnLoad();
+
+  function getQueryStringValue (key) {
+    return decodeURIComponent(window.location.search.replace(new RegExp("^(?:.*[&\\?]" + encodeURIComponent(key).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1"));
+  }
+
+  window.onload = function(){
+    var mergeaccountprocess = (new URLSearchParams(window.location.search)).get('mergeaccountprocess');
+    var version = getValueFromSession('version');
+    var isForgetPasswordAllow = getValueFromSession('version');
+    var renderingType = 'queryParams';
+    if (!mergeaccountprocess) {
+        mergeaccountprocess = localStorage.getItem('mergeaccountprocess');
+        if (mergeaccountprocess === '1') {
+            if (!version) {
+                version = localStorage.getItem('version');
+            }
+            hideElement("mergeAccountMessage");
+            renderingType = 'local-storage';
+            var error_summary = document.getElementById('error-summary');
+            if (error_summary) {
+                var errorMessage = error_summary.innerHTML.valueOf();
+                error_summary.innerHTML = errorMessage + 'to merge';
+            }
+        }
+    } else {
+        localStorage.clear()
+    }
+    addVersionToURL(version);
+    var error_message = (new URLSearchParams(window.location.search)).get('error_message');
+    var success_message = (new URLSearchParams(window.location.search)).get('success_message');
+
+    if(error_message){
+        var error_msg = document.getElementById('error-msg');
+        error_msg.className = error_msg.className.replace("hide","");
+        error_msg.innerHTML = error_message;
+    }else if(success_message){
+        var success_msg = document.getElementById("success-msg");
+        success_msg.className = success_msg.className.replace("hide","");
+        success_msg.innerHTML = success_message;
+    }
+    if (version >= 4) {
+        var forgotElement = document.getElementById("fgtPortalFlow");
+        if(forgotElement){
+          forgotElement.className = forgotElement.className.replace("hide","");
+        }
+    } else {
+        var forgotElement = document.getElementById("fgtKeycloakFlow");
+        if(forgotElement){
+          forgotElement.className = forgotElement.className.replace("hide","");
+          forgotElement.href = forgotElement.href + '&version=' + version ;
+        }
+    }
+    if(!version && isForgetPasswordAllow >=4 ){
+        hideElement("fgtKeycloakFlow");
+        var forgotElement = document.getElementById("fgtPortalFlow");
+        if(forgotElement){
+            forgotElement.className = forgotElement.className.replace("hide","");
+        }
+    }
+    if (mergeaccountprocess === '1') {
+        hideElement("kc-registration");
+        hideElement("stateButton");
+        hideElement("fgtKeycloakFlow");
+        hideElement("fgtPortalFlow");
+        // change sign in label with merge label
+        var signIn = document.getElementById("signIn");
+        if (signIn) {
+            signIn.innerText = 'Merge Account';
+            signIn.classList.add('fs-22');
+        }
+        // adding link to go back url
+        var goBackElement = document.getElementById("goBack");
+        if (goBackElement) {
+            goBackElement.className = goBackElement.className.replace("hide", "");
+        }
+        // if rendering type is local-storage get redirect url from localstorage else from query param
+        if (renderingType === 'local-storage') {
+            goBackElement.href = localStorage.getItem('redirectUrl');
+        } else {
+            goBackElement.href = (new URLSearchParams(window.location.search)).get('goBackUrl');
+            localStorage.setItem('mergeaccountprocess', mergeaccountprocess);
+            localStorage.setItem('version', version);
+            localStorage.setItem('redirectUrl', (new URLSearchParams(window.location.search)).get('goBackUrl'));
+        }
+        var mergeAccountMessage = document.getElementById("mergeAccountMessage");
+        if (mergeAccountMessage && renderingType === 'queryParams') {
+            mergeAccountMessage.className = mergeAccountMessage.className.replace("hide", "");
+        }
+    }
+    var autoMerge = getValueFromSession('automerge');
+    if (autoMerge === '1') {
+      var isValuePresent = (new URLSearchParams(window.location.search)).get('automerge');
+      if (isValuePresent) {
+        sessionStorage.removeItem('session_url');
+        initialize();
+      }
+        decoratePage('autoMerge');
+        storeValueForMigration();
+    }
+};
+
+var storeValueForMigration = function () {
+    // storing values in sessionStorage for future references
+    sessionStorage.setItem('automerge', getValueFromSession('automerge'));
+    sessionStorage.setItem('goBackUrl', getValueFromSession('goBackUrl'));
+    sessionStorage.setItem('identifierValue', getValueFromSession('identifierValue'));
+    sessionStorage.setItem('identifierType', getValueFromSession('identifierType'));
+    sessionStorage.setItem('userId', getValueFromSession('userId'));
+    sessionStorage.setItem('tncAccepted', getValueFromSession('tncAccepted'));
+    sessionStorage.setItem('tncVersion', getValueFromSession('tncVersion'));
+};
+var getValueFromSession = function (valueId) {
+    var value = (new URLSearchParams(window.location.search)).get(valueId);
+    if (value) {
+        sessionStorage.setItem(valueId, value);
+        sessionStorage.setItem('renderingType', 'queryParams');
+        return value
+    } else {
+        value = sessionStorage.getItem(valueId);
+        if (value) {
+            sessionStorage.setItem('renderingType', 'sessionStorage');
+        }
+        return value
+    }
+};
+
+
+var getValue = function (valueId) {
+    var value = (new URLSearchParams(window.location.search)).get(valueId);
+    if (value) {
+        localStorage.setItem('renderingType', 'queryParams');
+        return value
+    } else {
+        value = localStorage.getItem(valueId);
+        if (value) {
+            localStorage.setItem('renderingType', 'localStorage');
+        }
+        return value
+    }
+};
+
+
+var decoratePage = function (pageType) {
+    if (pageType === 'autoMerge') {
+        var identifierValue = getValueFromSession('identifierValue');
+        var goBackUrl = getValueFromSession('goBackUrl');
+        var signIn = document.getElementById("signIn");
+        if (signIn) {
+            signIn.innerText = 'Merge Account';
+            signIn.classList.add('fs-22');
+        }
+        var loginButton = document.getElementById("login");
+        if (loginButton) {
+            loginButton.innerText = 'Next';
+        }
+        setElementValue('username', identifierValue);
+
+        var elementsToHide = ['kc-registration', 'stateButton', 'fgtKeycloakFlow', 'fgtPortalFlow',
+            'usernameLabel', 'usernameLabelPlaceholder', 'username'];
+
+        unHideElement('migrateAccountMessage');
+        unHideElement('goBack');
+        var goBackElement = document.getElementById("goBack");
+        if (goBackElement) {
+            goBackElement.href = goBackUrl;
+        }
+        if (sessionStorage.getItem('renderingType') === 'sessionStorage') {
+            unHideElement('selfSingUp');
+            var errorElement = document.getElementById('error-summary');
+            if (errorElement) { 
+                var wrongPasswordError = 'Invalid Email Address/Mobile number or password. Please try again with valid credentials';
+                if (errorElement.innerText.toLowerCase() === wrongPasswordError.toLowerCase()) {
+                    unHideElement('inCorrectPasswordError');
+                    handlePasswordFailure();
+                }
+                elementsToHide.push('error-summary');
+            }
+        }
+        for (var i = 0; i < elementsToHide.length; i++) {
+            hideElement(elementsToHide[i]);
+        }
+    }
+};
+
+var handlePasswordFailure = function () {
+    var passwordFailCount = Number(sessionStorage.getItem('passwordFailCount') || 0);
+    passwordFailCount = passwordFailCount + 1;
+    sessionStorage.setItem('passwordFailCount', passwordFailCount);
+    if (passwordFailCount >= 2) {
+        const url = '/sign-in/sso/auth?status=error' + '&identifierType=' + getValueFromSession('identifierType');
+        let query = '&userId=' + getValueFromSession('userId') + '&identifierValue=' + getValueFromSession('identifierValue');
+        query = query + '&tncAccepted=' + getValueFromSession('tncAccepted') + '&tncVersion=' + getValueFromSession('tncVersion');
+        window.location.href = window.location.protocol + '//' + window.location.host + url + query;
+    }
+};
+
+var unHideElement = function (elementId) {
+    var elementToUnHide = document.getElementById(elementId);
+    if (elementToUnHide) {
+        elementToUnHide.className = elementToUnHide.className.replace("hide", "");
+    }
+};
+var setElementValue = function (elementId, elementValue) {
+    var element = document.getElementById(elementId);
+    if (element) {
+        element.value = elementValue;
+    }
+};
+
+var storeLocation = function(){
+    sessionStorage.setItem('url', window.location.href);
+}
+var addVersionToURL = function (version){
+
+    if (version >= 1){
+
+        var selfSingUp = document.getElementById("selfSingUp");
+
+        if(selfSingUp) {
+            selfSingUp.className = selfSingUp.className.replace(/\bhide\b/g, "");
+        }
+
+        var stateButton = document.getElementById("stateButton");
+
+        if ((version >= 2) && stateButton) {
+            stateButton.className = stateButton.className.replace(/\bhide\b/g, "");
+        }
+    }
+}
+  var makeDivUnclickable = function() {
+    var otpForm = document.getElementById("kc-totp-login-form");
+    var resetPswdForm = document.getElementById("kc-reset-password-form");
+    if(resetPswdForm!==null){
+      logInteractEvent("reset-password-submit");
+      logLoginImpressionEvent("pageexit");
+    }
+    if(otpForm!==null){
+      logInteractEvent("otp-submit");
+      logLoginImpressionEvent("pageexit");
+    }
+    var containerElement = document.getElementById('kc-form');
+    var overlayEle = document.getElementById('kc-form-wrapper');
+    overlayEle.style.display = 'block';
+    containerElement.setAttribute('class', 'unClickable');
+  };
+
+var inputBoxFocusIn = function(currentElement){
+    var autoMerge = getValueFromSession('automerge');
+    if (autoMerge === '1') {
+        return;
+    }
+    if(currentElement.id !== 'totp'){
+      var placeholderElement = document.querySelector("label[id='"+currentElement.id+"LabelPlaceholder']");
+      var labelElement = document.querySelector("label[id='"+currentElement.id+"Label']");
+      placeholderElement.className = placeholderElement.className.replace("hide", "");
+      addClass(labelElement,"hide");
+    }
+};
+var inputBoxFocusOut = function(currentElement){
+  var autoMerge = getValueFromSession('automerge');
+    if (autoMerge === '1') {
+        return;
+    }
+    if(currentElement.id !== 'totp'){
+      var placeholderElement = document.querySelector("label[id='"+currentElement.id+"LabelPlaceholder']");
+      var labelElement = document.querySelector("label[id='"+currentElement.id+"Label']");
+      labelElement.className = labelElement.className.replace("hide", "");
+      addClass(placeholderElement,"hide");
+    }
+  };
+  function hideElement(elementId) {
+    var elementToHide = document.getElementById(elementId);
+    if (elementToHide) {
+        addClass(elementToHide, "hide");
+    }
+  }
+  function addClass(element,classname)
+  {
+    var arr;
+      arr = element.className.split(" ");
+      if (arr.indexOf(classname) == -1) {
+        element.className += " " + classname;
+    }
+  }
+
+  var storeForgotPasswordLocation = function(ev) {
+    ev.preventDefault();
+    //Telemetry.config.batchsize = 2;
+    sessionStorage.setItem('url', window.location.href);
+    //makeDivUnclickable();
+    logInteractEvent("forgot-password");
+    logLoginImpressionEvent("pageexit");
+    setTimeout(function(){
+      window.location.href = ev.target.href;
+    },100);
+    //return true;
+  }
+  var createTelemetryEvent = function(ev) {
+    ev.preventDefault();
+    logInteractEvent("forgot-password");
+    logLoginImpressionEvent("pageexit");
+  }
+  var urlMap = {
+    google: '/google/auth',
+    state: '/sign-in/sso/select-org',
+    self: '/signup'
+  }
+  var navigate = function(type) {
+    var version = getValueFromSession('version');
+    if(version == '1' || version == '2') {
+      if(type == 'google' || type == 'self'){
+        if(type=='google'){
+          logInteractEvent("google-signin");
+        }else if(type=='self'){
+          logInteractEvent("sign-up");
+        }
+        redirect(urlMap[type]);
+      } else if(type == 'state') {
+        logInteractEvent("state-signin");
+        handleSsoEvent()
+      }
+    } else if (version >= '3') {
+      if(type == 'google') {
+        logInteractEvent("google-signin");
+        handleGoogleAuthEvent()
+      } else if(type == 'state' || type == 'self') {
+        if(type == 'state'){
+          logInteractEvent("state-signin");
+        }else if(type == 'self'){
+          logInteractEvent("sign-up");
+        }
+        redirectToPortal(urlMap[type])
+      }
+    }
+  }
+
+  var redirectToLib = () => {
+    window.location.href = window.location.protocol + '//' + window.location.host + '/resource';
+  };
+
+  var viewPassword = function(previewButton){
+    console.log('Show Password');
+
+    var newPassword = document.getElementById("password-new");
+      if (newPassword.type === "password") {
+      newPassword.type = "text";
+      addClass(previewButton,"slash");
+      } else {
+      newPassword.type = "password";
+      previewButton.className = previewButton.className.replace("slash","");
+      }
+  }
+
+var initialize = () => {
+    getValueFromSession('redirect_uri');
+    if (!sessionStorage.getItem('session_url')) {
+        sessionStorage.setItem('session_url', window.location.href);
+    }
+};
+
+initialize();
+
+var forgetPassword = (redirectUrlPath) => {
+    const curUrlObj = window.location;
+    var redirect_uri = getValueFromSession('redirect_uri');
+    var client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+    const sessionUrl = sessionStorage.getItem('session_url');
+    if (sessionUrl) {
+        const sessionUrlObj = new URL(sessionUrl);
+        const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
+        if (redirect_uri) {
+            const redirect_uriLocation = new URL(redirect_uri);
+            if(client_id === 'android'){
+                window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
+            }
+            else{
+                window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
+                    redirectUrlPath + updatedQuery;
+            }
+        } else {
+            redirectToLib();
+        }
+    } else {
+        redirectToLib();
+    }
+}
+
+var redirect = (redirectUrlPath) => {
+    console.log('redirect', redirectUrlPath);
+    const curUrlObj = window.location;
+    var redirect_uri = getValueFromSession('redirect_uri');
+    var client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+    const sessionUrl = sessionStorage.getItem('session_url');
+    if (sessionUrl) {
+        const sessionUrlObj = new URL(sessionUrl);
+        const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
+        if (redirect_uri) {
+            const redirect_uriLocation = new URL(redirect_uri);
+            if (client_id === 'android') {
+                window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
+            } else {
+                window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
+                    redirectUrlPath + updatedQuery;
+            }
+        } else {
+            redirectToLib();
+        }
+    } else {
+        redirectToLib();
+    }
+};
+var handleSsoEvent = () => {
+    const ssoPath = '/sign-in/sso/select-org';
+    const curUrlObj = window.location;
+    let redirect_uri = getValueFromSession('redirect_uri');
+    let client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+    const sessionUrl = sessionStorage.getItem('session_url');
+    if (sessionUrl) {
+        const sessionUrlObj = new URL(sessionUrl);
+        if (redirect_uri) {
+            const redirect_uriLocation = new URL(redirect_uri);
+            if (client_id === 'android') {
+                const ssoUrl = sessionUrlObj.protocol + '//' + sessionUrlObj.host + ssoPath;
+                window.location.href = redirect_uri + '?ssoUrl=' + ssoUrl;
+            } else {
+                window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host + ssoPath;
+            }
+        } else {
+            redirectToLib();
+        }
+    } else {
+        redirectToLib();
+    }
+};
+var handleGoogleAuthEvent = () => {
+    const googleAuthUrl = '/google/auth';
+    const curUrlObj = window.location;
+    let redirect_uri = getValueFromSession('redirect_uri');
+    let client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+    const updatedQuery = curUrlObj.search + '&error_callback=' + curUrlObj.href.split('?')[0];
+    const sessionUrl = sessionStorage.getItem('session_url');
+    if (sessionUrl) {
+        const sessionUrlObj = new URL(sessionUrl);
+        const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
+        if (redirect_uri) {
+            const redirect_uriLocation = new URL(redirect_uri);
+            if (client_id === 'android') {
+                let host = sessionUrlObj.host;
+                if (host.indexOf("merge.") !== -1) {
+                    host = host.slice(host.indexOf("merge.") + 6, host.length);
+                }
+                const googleRedirectUrl = sessionUrlObj.protocol + '//' + host + googleAuthUrl;
+                window.location.href = redirect_uri + '?googleRedirectUrl=' + googleRedirectUrl + updatedQuery;
+            } else {
+                window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host + googleAuthUrl + updatedQuery;
+            }
+        } else {
+            redirectToLib();
+        }
+    } else {
+        redirectToLib();
+    }
+};
+var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and self signUp
+    const curUrlObj = window.location;
+    var redirect_uri = getValueFromSession('redirect_uri');
+    var client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+    const sessionUrl = sessionStorage.getItem('session_url');
+    if (sessionUrl) {
+        const sessionUrlObj = new URL(sessionUrl);
+        const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
+        if (redirect_uri) {
+            const redirect_uriLocation = new URL(redirect_uri);
+            if (client_id === 'android') {
+                window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
+            } else {
+                window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
+                    redirectUrlPath + updatedQuery;
+            }
+        } else {
+            redirectToLib();
+        }
+    } else {
+        redirectToLib();
+    }
+};
+
+var validatePassword = () => {
+	setTimeout(() => {
+		var textInput = document.getElementById("password-new").value;
+		var text2Input = document.getElementById("password-confirm").value;
+		const specRegex = new RegExp('^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[~.,)(}{\\[!"#$%&\'()*+,-./:;<=>?@[^_`{|}~\\]])(?=\\S+$).{8,}');
+		var error_msg = document.getElementById('passwd-error-msg');
+		var match_error_msg = document.getElementById('passwd-match-error-msg');
+    if (specRegex.test(textInput)) {
+			error_msg.className = error_msg.className.replace("passwderr","passwdchk");
+			if (textInput === text2Input) {
+				match_error_msg.className = match_error_msg.className.replace("show","hide");
+				document.getElementById("login").disabled = false;
+			}
+		} else {
+			error_msg.className = error_msg.className.replace("passwdchk","passwderr");
+		}
+		if (textInput !== text2Input) {
+			document.getElementById("login").disabled = true;
+		}
+	});
+}
+
+var matchPassword = () => {
+	setTimeout(() => {
+		var textInput = document.getElementById("password-new").value;
+		var text2Input = document.getElementById("password-confirm").value;
+		const specRegex = new RegExp('^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[~.,)(}{\\[!"#$%&\'()*+,-./:;<=>?@[^_`{|}~\\]])(?=\\S+$).{8,}');
+		var match_error_msg = document.getElementById('passwd-match-error-msg');
+		if (textInput === text2Input) {
+            if (specRegex.test(text2Input)) {
+				match_error_msg.className = match_error_msg.className.replace("show","hide");
+				document.getElementById("login").disabled = false;
+			}
+		} else {
+			match_error_msg.className = match_error_msg.className.replace("hide","show");
+			document.getElementById("login").disabled = true;
+		}
+	});
+}
+
+//})();
diff --git a/ansible/artifacts/sunbird/login/theme.properties b/ansible/artifacts/sunbird/login/theme.properties
index 83d89458c..e31fca6c4 100644
--- a/ansible/artifacts/sunbird/login/theme.properties
+++ b/ansible/artifacts/sunbird/login/theme.properties
@@ -13,9 +13,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+# scripts=js/login.js?v=1.15.b
 
 parent=base
 styles=css/semantic.min.css?v=1.15.b css/login.css?v=1.15.b
-scripts=js/login.js?v=1.15.b
+scripts=js/jquery-3.3.1.min.js?v=1.15 js/telemetry_service.js
 kcFeedbackAreaClass=ui info message

From 48170b500ee312364c9f51502e3bde0446b92ddc Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <yravinderkumar33@gmail.com>
Date: Mon, 11 Jan 2021 12:41:07 +0530
Subject: [PATCH 112/184] Issue #SB-22405 fix: added conditions for desktop
 app.

---
 .../sunbird/login/resources/js/telemetry_service.js    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
index ed1a4ef2e..4645dfd3f 100644
--- a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
+++ b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -3038,7 +3038,7 @@ var forgetPassword = (redirectUrlPath) => {
         const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
         if (redirect_uri) {
             const redirect_uriLocation = new URL(redirect_uri);
-            if(client_id === 'android'){
+          if (client_id === 'android' || client_id === 'desktop') {
                 window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
             }
             else{
@@ -3064,7 +3064,7 @@ var redirect = (redirectUrlPath) => {
         const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
         if (redirect_uri) {
             const redirect_uriLocation = new URL(redirect_uri);
-            if (client_id === 'android') {
+            if (client_id === 'android' || client_id === 'desktop') {
                 window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
             } else {
                 window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
@@ -3087,7 +3087,7 @@ var handleSsoEvent = () => {
         const sessionUrlObj = new URL(sessionUrl);
         if (redirect_uri) {
             const redirect_uriLocation = new URL(redirect_uri);
-            if (client_id === 'android') {
+            if (client_id === 'android' || client_id === 'desktop') {
                 const ssoUrl = sessionUrlObj.protocol + '//' + sessionUrlObj.host + ssoPath;
                 window.location.href = redirect_uri + '?ssoUrl=' + ssoUrl;
             } else {
@@ -3112,7 +3112,7 @@ var handleGoogleAuthEvent = () => {
         const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
         if (redirect_uri) {
             const redirect_uriLocation = new URL(redirect_uri);
-            if (client_id === 'android') {
+            if (client_id === 'android' || client_id === 'desktop') {
                 let host = sessionUrlObj.host;
                 if (host.indexOf("merge.") !== -1) {
                     host = host.slice(host.indexOf("merge.") + 6, host.length);
@@ -3139,7 +3139,7 @@ var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and sel
         const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
         if (redirect_uri) {
             const redirect_uriLocation = new URL(redirect_uri);
-            if (client_id === 'android') {
+            if (client_id === 'android' || client_id === 'desktop') {
                 window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
             } else {
                 window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +

From faf0a98c132fbe90a52a9813caf345c76d208700 Mon Sep 17 00:00:00 2001
From: AMIT KUMAR <amit.kumar@tarento.com>
Date: Mon, 11 Jan 2021 13:54:28 +0530
Subject: [PATCH 113/184] Issue #SC-2117 feat:Removed depricated API (#2139)

---
 ansible/roles/kong-api/defaults/main.yml | 762 ++---------------------
 1 file changed, 65 insertions(+), 697 deletions(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index cd4edfa95..e16f9ea64 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -51,7 +51,6 @@ echo_service_prefix: /echo
 composite_service_prefix: /composite
 api_manager_perfix: /api-manager
 meta_service_prefix: /meta
-dashboard_service_prefix: /dashboard
 announcement_service_prefix: /announcement
 dialcode_service_prefix: /dialcode
 channel_service_prefix: /channel
@@ -207,42 +206,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: addUserSkill
-    uris: "{{ user_service_prefix }}/v1/skill/add"
-    upstream_url: "{{ learning_service_url }}/v1/user/skill/add"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'userCreate '
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: addUserSkillEndorsement
-    uris: "{{ user_service_prefix }}/v1/skill/endorse/add"
-    upstream_url: "{{ learning_service_url }}/v1/user/skill/endorse/add"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'userCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
   - name: addUserToBatch
     uris: "{{ course_service_prefix }}/v1/batch/user/add"
     upstream_url: "{{ lms_service_url }}/v1/course/batch/users/add"
@@ -547,42 +510,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: createAssertion
-    uris: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/create"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/badge/assertion/create"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: createBadgeClass
-    uris: "{{ badge_service_prefix }}/v1/issuer/badge/create"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/badge/create"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
   - name: createBatch
     uris: "{{ course_service_prefix }}/v1/batch/create"
     upstream_url: "{{ lms_service_url }}/v1/course/batch/create"
@@ -673,24 +600,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: createData
-    uris: "{{ data_service_prefix }}/v1/object/create"
-    upstream_url: "{{ learning_service_url }}/v1/object/create"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'objectCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ large_request_size_limit }}"
-
   - name: createForm
     uris: "{{ data_service_prefix }}/v1/form/create"
     upstream_url: "{{ player_service_url }}/plugin/v1/form/create"
@@ -763,42 +672,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: createissuer
-    uris: "{{ badge_service_prefix }}/v1/issuer/create"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/create"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: createLocation
-    uris: "{{ org_service_prefix }}/v1/location/create"
-    upstream_url: "{{ learning_service_url }}/v1/notification/location/create"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'locationCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
   - name: createLock
     uris: "{{ lock_service_prefix }}/v1/create"
     upstream_url: "{{ knowledge_mw_service_url }}/v1/lock/create"
@@ -1033,78 +906,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: deleteBadgeClass
-    uris: "{{ badge_service_prefix }}/v1/issuer/badge/delete"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/badge/delete"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeAdmin'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: deleteData
-    uris: "{{ data_service_prefix }}/v1/object/delete"
-    upstream_url: "{{ learning_service_url }}/v1/object/delete"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'objectAdmin'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: deleteIssuer
-    uris: "{{ badge_service_prefix }}/v1/issuer/delete"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/delete"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeAdmin'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: deleteLocation
-    uris: "{{ org_service_prefix }}/v1/location/delete"
-    upstream_url: "{{ learning_service_url }}/v1/notification/location/delete"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'locationAdmin'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
   - name: deleteNote
     uris: "{{ notes_service_prefix }}/v1/delete"
     upstream_url: "{{ learning_service_url }}/v1/note/delete"
@@ -1291,265 +1092,17 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'appAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
-  - name: flagContent
-    uris: "{{ content_prefix }}/v1/flag"
-    upstream_url: "{{ knowledge_mw_service_url }}/v1/content/flag"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
-  - name: freshDesk
-    uris: "{{ tickets_prefix }}/v1/create"
-    upstream_url: "{{ freshDesk_url }}/api/v2/tickets"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'appAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
-  - name: generateDialcodes
-    uris: "{{ dialcode_service_prefix }}/v1/generate"
-    upstream_url: "{{ knowledge_mw_service_url }}/v1/dialcode/generate"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'dialcodeCreate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
-  - name: generateOtp
-    uris: "{{ otp_service_prefix }}/v1/generate"
-    upstream_url: "{{ learning_service_url }}/v1/otp/generate"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'userAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
-  - name: getAllData
-    uris: "{{ data_service_prefix }}/v1/object/read/list"
-    upstream_url: "{{ learning_service_url }}/v1/object/read/list"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'objectAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: getAllIssuer
-    uris: "{{ badge_service_prefix }}/v1/issuer/list"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/list"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: getAssertion
-    uris: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/read"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/badge/assertion/read"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: getAssertionList
-    uris: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/search"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/badge/assertion/search"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: getAudienceCount
-    uris: "{{ data_service_prefix }}/v1/notification/audience"
-    upstream_url: "{{ learning_service_url }}/v1/notification/audience"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'announcementAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
-  - name: getBadgeClass
-    uris: "{{ badge_service_prefix }}/v1/issuer/badge/read"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/badge/read"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: getBatch
-    uris: "{{ course_service_prefix }}/v1/batch/read"
-    upstream_url: "{{ lms_service_url }}/v1/course/batch/read"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'courseAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
-  - name: collectionSummaryAgg
-    uris: "/v1/collection/summary"
-    upstream_url: "{{ lms_service_url }}/v1/collection/summary"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'courseAdmin'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"      
-
-  - name: getContentUploadUrl
-    uris: "{{ content_prefix }}/v1/upload/url/read"
-    upstream_url: "{{ knowledge_mw_service_url }}/v1/content/upload/url"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'contentUpdate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
-  - name: getCourseHierarchy
-    uris: "{{ course_service_prefix }}/v1/hierarchy"
-    upstream_url: "{{ knowledge_mw_service_url }}/v1/course/hierarchy"
-    strip_uri: true
-    plugins:
-    - name: cors
-    - "{{ statsd_pulgin }}"
+        - 'appAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: ip
+      config.limit_by: credential
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getData
-    uris: "{{ data_service_prefix }}/v1/object/read"
-    upstream_url: "{{ learning_service_url }}/v1/object/read"
+  - name: flagContent
+    uris: "{{ content_prefix }}/v1/flag"
+    upstream_url: "{{ knowledge_mw_service_url }}/v1/content/flag"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1557,17 +1110,17 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'objectAccess'
+        - 'contentAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
       config.limit_by: credential
     - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getIssuerDetails
-    uris: "{{ badge_service_prefix }}/v1/issuer/read"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/read"
+  - name: freshDesk
+    uris: "{{ tickets_prefix }}/v1/create"
+    upstream_url: "{{ freshDesk_url }}/api/v2/tickets"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1575,17 +1128,17 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'badgeAccess'
+        - 'appAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
       config.limit_by: credential
     - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getLocation
-    uris: "{{ org_service_prefix }}/v1/location/read"
-    upstream_url: "{{ learning_service_url }}/v1/notification/location/read"
+  - name: generateDialcodes
+    uris: "{{ dialcode_service_prefix }}/v1/generate"
+    upstream_url: "{{ knowledge_mw_service_url }}/v1/dialcode/generate"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1593,7 +1146,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'locationAccess'
+        - 'dialcodeCreate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -1601,9 +1154,9 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getMediaTypes
-    uris: "{{ user_service_prefix }}/v1/mediatype/list"
-    upstream_url: "{{ learning_service_url }}/v1/user/mediatype/list"
+  - name: generateOtp
+    uris: "{{ otp_service_prefix }}/v1/generate"
+    upstream_url: "{{ learning_service_url }}/v1/otp/generate"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1617,11 +1170,11 @@ kong_apis:
       config.hour: "{{ medium_rate_limit_per_hour }}"
       config.limit_by: credential
     - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getPageSettings
-    uris: "{{ data_service_prefix }}/v1/page/read"
-    upstream_url: "{{ lms_service_url }}/v1/page/read"
+  - name: getBatch
+    uris: "{{ course_service_prefix }}/v1/batch/read"
+    upstream_url: "{{ lms_service_url }}/v1/course/batch/read"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1629,7 +1182,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'pageAccess'
+        - 'courseAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -1637,9 +1190,9 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getParticipants
-    uris: "{{ course_service_prefix }}/v1/batch/participants/list"
-    upstream_url: "{{ lms_service_url }}/v1/batch/participants/list"
+  - name: collectionSummaryAgg
+    uris: "/v1/collection/summary"
+    upstream_url: "{{ lms_service_url }}/v1/collection/summary"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1647,17 +1200,17 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'courseCreate'
+        - 'courseAdmin'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
       config.limit_by: credential
     - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
+      config.allowed_payload_size: "{{ small_request_size_limit }}"      
 
-  - name: getSkills
-    uris: "{{ data_service_prefix }}/v1/skills"
-    upstream_url: "{{ learning_service_url }}/v1/skills"
+  - name: getContentUploadUrl
+    uris: "{{ content_prefix }}/v1/upload/url/read"
+    upstream_url: "{{ knowledge_mw_service_url }}/v1/content/upload/url"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1665,35 +1218,31 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'userAccess'
+        - 'contentUpdate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
       config.limit_by: credential
     - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getSystemSettings
-    uris: "{{ data_service_prefix }}/v1/system/settings/get"
-    upstream_url: "{{ learning_service_url }}/v1/system/settings/get"
+  - name: getCourseHierarchy
+    uris: "{{ course_service_prefix }}/v1/hierarchy"
+    upstream_url: "{{ knowledge_mw_service_url }}/v1/course/hierarchy"
     strip_uri: true
     plugins:
-    - name: jwt
     - name: cors
     - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'appAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
+      config.limit_by: ip
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getTenantInfo
-    uris: "{{ org_service_prefix }}/v1/tenant/info"
-    upstream_url: "{{ player_service_url }}/v1/tenant/info"
+  - name: getPageSettings
+    uris: "{{ data_service_prefix }}/v1/page/read"
+    upstream_url: "{{ lms_service_url }}/v1/page/read"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1701,7 +1250,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'orgAccess'
+        - 'pageAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -1709,18 +1258,17 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getUploadJobStatusLink
-    uris: "{{ data_service_prefix }}/v1/upload/statusDownloadLink"
-    upstream_url: "{{ learning_service_url }}/v1/upload/statusDownloadLink"
+  - name: getParticipants
+    uris: "{{ course_service_prefix }}/v1/batch/participants/list"
+    upstream_url: "{{ lms_service_url }}/v1/batch/participants/list"
     strip_uri: true
     plugins:
     - name: jwt
     - name: cors
     - "{{ statsd_pulgin }}"
     - name: acl
-      config.whitelist: 
-        - 'orgSuperAdmin'
-        - 'userSuperAdmin'
+      config.whitelist:
+        - 'courseCreate'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -1728,9 +1276,9 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getUserByKey
-    uris: "{{ user_service_prefix }}/v1/get"
-    upstream_url: "{{ learning_service_url }}/v1/user/get"
+  - name: getSystemSettings
+    uris: "{{ data_service_prefix }}/v1/system/settings/get"
+    upstream_url: "{{ learning_service_url }}/v1/system/settings/get"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1738,7 +1286,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'userAccess'
+        - 'appAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -1746,9 +1294,9 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getUserConsumptionDasbhoard
-    uris: "{{ dashboard_service_prefix }}/v1/consumption/user"
-    upstream_url: "{{ learning_service_url }}/v1/dashboard/consumption/user"
+  - name: getTenantInfo
+    uris: "{{ org_service_prefix }}/v1/tenant/info"
+    upstream_url: "{{ player_service_url }}/v1/tenant/info"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1756,7 +1304,7 @@ kong_apis:
     - "{{ statsd_pulgin }}"
     - name: acl
       config.whitelist:
-        - 'userAdmin'
+        - 'orgAccess'
     - name: rate-limiting
       config.policy: local
       config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -1764,9 +1312,9 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getUserProfile
-    uris: "{{ user_service_prefix }}/v1/read"
-    upstream_url: "{{ learning_service_url }}/v1/user/read"
+  - name: getUserByKey
+    uris: "{{ user_service_prefix }}/v1/get"
+    upstream_url: "{{ learning_service_url }}/v1/user/get"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1782,9 +1330,9 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getUserProfileV2
-    uris: "{{ user_service_prefix }}/v2/read"
-    upstream_url: "{{ learning_service_url }}/v2/user/read"
+  - name: getUserProfile
+    uris: "{{ user_service_prefix }}/v1/read"
+    upstream_url: "{{ learning_service_url }}/v1/user/read"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1800,9 +1348,9 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: getUserSkill
-    uris: "{{ user_service_prefix }}/v1/skill/read"
-    upstream_url: "{{ learning_service_url }}/v1/user/skill/read"
+  - name: getUserProfileV2
+    uris: "{{ user_service_prefix }}/v2/read"
+    upstream_url: "{{ learning_service_url }}/v2/user/read"
     strip_uri: true
     plugins:
     - name: jwt
@@ -1816,7 +1364,7 @@ kong_apis:
       config.hour: "{{ medium_rate_limit_per_hour }}"
       config.limit_by: credential
     - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
+      config.allowed_payload_size: "{{ small_request_size_limit }}"
 
   - name: getUserType
     uris: "{{ user_service_prefix }}/v1/type/list"
@@ -2288,24 +1836,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: metricsSearchData
-    uris: "{{ data_service_prefix }}/v1/object/metrics"
-    upstream_url: "{{ learning_service_url }}/v1/object/metrics"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'objectAdmin'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
   - name: orgAssignKeys
     uris: "{{ org_service_prefix }}/v1/assign/key"
     upstream_url: "{{ learning_service_url }}/v1/org/assign/key"
@@ -2558,42 +2088,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: privateUserUpdate
-    uris: "{{ user_service_prefix }}/private/v1/update"
-    upstream_url: "{{ learning_service_url }}/private/user/v1/update"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'userSuperAdmin'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
-  - name: profileVisibility
-    uris: "{{ user_service_prefix }}/v1/profile/visibility"
-    upstream_url: "{{ learning_service_url }}/v1/user/profile/visibility"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'userAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
   - name: publishContent
     uris: "{{ content_prefix }}/v1/publish"
     upstream_url: "{{ knowledge_mw_service_url }}/v1/content/publish"
@@ -3406,42 +2900,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: revokeAssertion
-    uris: "{{ badge_service_prefix }}/v1/issuer/badge/assertion/delete"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/badge/assertion/delete"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeAdmin'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
-  - name: searchBadgeClass
-    uris: "{{ badge_service_prefix }}/v1/issuer/badge/search"
-    upstream_url: "{{ learning_service_url }}/v1/issuer/badge/search"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'badgeAccess'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
   - name: searchChannel
     uris: "{{ channel_service_prefix }}/v1/search"
     upstream_url: "{{ knowledge_mw_service_url }}/v1/channel/search"
@@ -3492,24 +2950,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: searchData
-    uris: "{{ data_service_prefix }}/v1/object/search"
-    upstream_url: "{{ learning_service_url }}/v1/object/search"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'objectAdmin'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ large_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
   - name: searchDialcodes
     uris: "{{ dialcode_service_prefix }}/v1/search"
     upstream_url: "{{ knowledge_mw_service_url }}/v1/dialcode/search"
@@ -3646,24 +3086,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
-  - name: sendNotification
-    uris: "{{ data_service_prefix }}/v1/notification/send"
-    upstream_url: "{{ learning_service_url }}/v1/notification/send"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'appAdmin'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
   - name: submitContentForReview
     uris: "{{ content_prefix }}/v1/review"
     upstream_url: "{{ knowledge_mw_service_url }}/v1/content/review"
@@ -3898,24 +3320,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: updateData
-    uris: "{{ data_service_prefix }}/v1/object/update"
-    upstream_url: "{{ learning_service_url }}/v1/object/update"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'objectUpdate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
   - name: updateDesktopApp
     uris: "{{ desktop_app_prefix }}/v1/update"
     upstream_url: "{{ player_service_url }}/v1/desktop/update"
@@ -4024,24 +3428,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ small_request_size_limit }}"
 
-  - name: updateLocation
-    uris: "{{ org_service_prefix }}/v1/location/update"
-    upstream_url: "{{ learning_service_url }}/v1/notification/location/update"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'locationUpdate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
   - name: updateNote
     uris: "{{ notes_service_prefix }}/v1/update"
     upstream_url: "{{ learning_service_url }}/v1/note/update"
@@ -4204,24 +3590,6 @@ kong_apis:
     - name: request-size-limiting
       config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
-  - name: updateUserSkill
-    uris: "{{ user_service_prefix }}/v1/skill/update"
-    upstream_url: "{{ learning_service_url }}/v1/user/skill/update"
-    strip_uri: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - "{{ statsd_pulgin }}"
-    - name: acl
-      config.whitelist:
-        - 'userUpdate'
-    - name: rate-limiting
-      config.policy: local
-      config.hour: "{{ medium_rate_limit_per_hour }}"
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
-
   - name: uploadContent
     uris: "{{ content_prefix }}/v1/upload"
     upstream_url: "{{ knowledge_mw_service_url }}/v1/content/upload"

From fa6e9adba6c40496fbe1e26610e710e1687104a6 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <yravinderkumar33@gmail.com>
Date: Mon, 11 Jan 2021 16:38:23 +0530
Subject: [PATCH 114/184] Issue #SB-22405 fix: login telemetry fix

---
 .../artifacts/sunbird/login/resources/css/login.css |  5 +++++
 .../sunbird/login/resources/js/telemetry_service.js | 13 +++++++++----
 ansible/artifacts/sunbird/login/theme.properties    |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ansible/artifacts/sunbird/login/resources/css/login.css b/ansible/artifacts/sunbird/login/resources/css/login.css
index b84a6a8ee..8e0e931c8 100644
--- a/ansible/artifacts/sunbird/login/resources/css/login.css
+++ b/ansible/artifacts/sunbird/login/resources/css/login.css
@@ -138,6 +138,10 @@ p.subtitle {
 .textCenter {
     text-align: center !important;
 }
+
+.textRight{
+    text-align: right !important;
+}
 .mb-16{
     margin-bottom: 16px !important;
 }
@@ -341,6 +345,7 @@ h1, h2, h3, h4, h5,
     cursor: pointer
 }
 
+
 .width-100 {
     width: 100%;
 }
diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
index 4645dfd3f..7f8e66c29 100644
--- a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
+++ b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -2476,11 +2476,16 @@ if (typeof module != 'undefined') {
 }
 
 let pdataId = "";
-if(window.location.origin.indexOf("diksha.gov.in") >= 0){
+if (window.location.origin.indexOf("diksha.gov.in") >= 0) {
   pdataId = "prod.diksha.portal";
-}else if(window.location.origin.indexOf("staging.ntp.net.in") >= 0){
+} else if (window.location.origin.indexOf("staging.ntp.net.in") >= 0) {
   pdataId = "staging.diksha.portal";
-}else{
+} else if (window.location.origin.indexOf("staging.sunbirded.org") >= 0) {
+  pdataId = "staging.diksha.portal";
+} else if (window.location.origin.indexOf("dev.sunbirded.org") >= 0) {
+  pdataId = "dev.diksha.portal";
+}
+else {
   pdataId = "preprod.diksha.portal";
 }
 
@@ -2512,7 +2517,7 @@ if(client_id.toLowerCase() === 'android'){
     hostURL = url;
   }
   function OnLoad() {
-    tenantId = sessionStorage.getItem("tenantSlug");
+    tenantId = sessionStorage.getItem("tenantSlug") || 'sunbird';
     getOrgInfo(tenantId).done(function () {
       initTelemetryService();
       logLoginImpressionEvent("init");
diff --git a/ansible/artifacts/sunbird/login/theme.properties b/ansible/artifacts/sunbird/login/theme.properties
index e31fca6c4..153e0d101 100644
--- a/ansible/artifacts/sunbird/login/theme.properties
+++ b/ansible/artifacts/sunbird/login/theme.properties
@@ -17,5 +17,5 @@
 
 parent=base
 styles=css/semantic.min.css?v=1.15.b css/login.css?v=1.15.b
-scripts=js/jquery-3.3.1.min.js?v=1.15 js/telemetry_service.js
+scripts=js/jquery-3.3.1.min.js?v=1.15.b js/telemetry_service.js?v=1.15.b
 kcFeedbackAreaClass=ui info message

From 76cc649b10fefcc063bccffe44c990bcf6a01b5e Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <yravinderkumar33@gmail.com>
Date: Mon, 11 Jan 2021 17:13:04 +0530
Subject: [PATCH 115/184] Issue #SB-22405 fix: pid fix

---
 .../sunbird/login/resources/js/telemetry_service.js          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
index 7f8e66c29..b578b1277 100644
--- a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
+++ b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -2483,9 +2483,8 @@ if (window.location.origin.indexOf("diksha.gov.in") >= 0) {
 } else if (window.location.origin.indexOf("staging.sunbirded.org") >= 0) {
   pdataId = "staging.diksha.portal";
 } else if (window.location.origin.indexOf("dev.sunbirded.org") >= 0) {
-  pdataId = "dev.diksha.portal";
-}
-else {
+  pdataId = "dev.sunbird.portal";
+} else {
   pdataId = "preprod.diksha.portal";
 }
 

From 8fa683f1a0c335aaf06e4d5216623a92d20c4b58 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <yravinderkumar33@gmail.com>
Date: Mon, 11 Jan 2021 17:33:44 +0530
Subject: [PATCH 116/184] Issue #SB-22405 fix: Telemetry is missing on login
 page (Normal login, Google Sign in, State Signin, Forget password, Register
 here) (#2146)

* Issue #SB-22405 fix: Telemetry is missing on login page (Normal login, Google Sign in, State Signin, Forget password, Register here)

* Issue #SB-22405 fix: added conditions for desktop app.

* Issue #SB-22405 fix: login telemetry fix

* Issue #SB-22405 fix: pid fix
---
 .../sunbird/login/resources/css/login.css     |    5 +
 .../login/resources/js/jquery-3.3.1.min.js    |    2 +
 .../login/resources/js/telemetry_service.js   | 3200 +++++++++++++++++
 .../artifacts/sunbird/login/theme.properties  |    4 +-
 4 files changed, 3209 insertions(+), 2 deletions(-)
 create mode 100644 ansible/artifacts/sunbird/login/resources/js/jquery-3.3.1.min.js
 create mode 100644 ansible/artifacts/sunbird/login/resources/js/telemetry_service.js

diff --git a/ansible/artifacts/sunbird/login/resources/css/login.css b/ansible/artifacts/sunbird/login/resources/css/login.css
index b84a6a8ee..8e0e931c8 100644
--- a/ansible/artifacts/sunbird/login/resources/css/login.css
+++ b/ansible/artifacts/sunbird/login/resources/css/login.css
@@ -138,6 +138,10 @@ p.subtitle {
 .textCenter {
     text-align: center !important;
 }
+
+.textRight{
+    text-align: right !important;
+}
 .mb-16{
     margin-bottom: 16px !important;
 }
@@ -341,6 +345,7 @@ h1, h2, h3, h4, h5,
     cursor: pointer
 }
 
+
 .width-100 {
     width: 100%;
 }
diff --git a/ansible/artifacts/sunbird/login/resources/js/jquery-3.3.1.min.js b/ansible/artifacts/sunbird/login/resources/js/jquery-3.3.1.min.js
new file mode 100644
index 000000000..4d9b3a258
--- /dev/null
+++ b/ansible/artifacts/sunbird/login/resources/js/jquery-3.3.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.3.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,i=Object.getPrototypeOf,o=n.slice,a=n.concat,s=n.push,u=n.indexOf,l={},c=l.toString,f=l.hasOwnProperty,p=f.toString,d=p.call(Object),h={},g=function e(t){return"function"==typeof t&&"number"!=typeof t.nodeType},y=function e(t){return null!=t&&t===t.window},v={type:!0,src:!0,noModule:!0};function m(e,t,n){var i,o=(t=t||r).createElement("script");if(o.text=e,n)for(i in v)n[i]&&(o[i]=n[i]);t.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[c.call(e)]||"object":typeof e}var b="3.3.1",w=function(e,t){return new w.fn.init(e,t)},T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;w.fn=w.prototype={jquery:"3.3.1",constructor:w,length:0,toArray:function(){return o.call(this)},get:function(e){return null==e?o.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return w.each(this,e)},map:function(e){return this.pushStack(w.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(o.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:s,sort:n.sort,splice:n.splice},w.extend=w.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||g(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)n=a[t],a!==(r=e[t])&&(l&&r&&(w.isPlainObject(r)||(i=Array.isArray(r)))?(i?(i=!1,o=n&&Array.isArray(n)?n:[]):o=n&&w.isPlainObject(n)?n:{},a[t]=w.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},w.extend({expando:"jQuery"+("3.3.1"+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==c.call(e))&&(!(t=i(e))||"function"==typeof(n=f.call(t,"constructor")&&t.constructor)&&p.call(n)===d)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e){m(e)},each:function(e,t){var n,r=0;if(C(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(C(Object(e))?w.merge(n,"string"==typeof e?[e]:e):s.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:u.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)(r=!t(e[o],o))!==s&&i.push(e[o]);return i},map:function(e,t,n){var r,i,o=0,s=[];if(C(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&s.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&s.push(i);return a.apply([],s)},guid:1,support:h}),"function"==typeof Symbol&&(w.fn[Symbol.iterator]=n[Symbol.iterator]),w.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function C(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!g(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},P="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",I="\\["+M+"*("+R+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+R+"))|)"+M+"*\\]",W=":("+R+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+I+")*)|.*)\\)|)",$=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),F=new RegExp("^"+M+"*,"+M+"*"),_=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="<a id='"+b+"'></a><select id='"+b+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:he(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:he(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=r.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})r.pseudos[t]=fe(t);for(t in{submit:!0,reset:!0})r.pseudos[t]=pe(t);function ye(){}ye.prototype=r.filters=r.pseudos,r.setFilters=new ye,a=oe.tokenize=function(e,t){var n,i,o,a,s,u,l,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=r.preFilter;while(s){n&&!(i=F.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),n=!1,(i=_.exec(s))&&(n=i.shift(),o.push({value:n,type:i[0].replace(B," ")}),s=s.slice(n.length));for(a in r.filter)!(i=V[a].exec(s))||l[a]&&!(i=l[a](i))||(n=i.shift(),o.push({value:n,type:a,matches:i}),s=s.slice(n.length));if(!n)break}return t?s.length:s?oe.error(e):k(e,u).slice(0)};function ve(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function me(e,t,n){var r=t.dir,i=t.next,o=i||r,a=n&&"parentNode"===o,s=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||a)return e(t,n,i);return!1}:function(t,n,u){var l,c,f,p=[T,s];if(u){while(t=t[r])if((1===t.nodeType||a)&&e(t,n,u))return!0}else while(t=t[r])if(1===t.nodeType||a)if(f=t[b]||(t[b]={}),c=f[t.uniqueID]||(f[t.uniqueID]={}),i&&i===t.nodeName.toLowerCase())t=t[r]||t;else{if((l=c[o])&&l[0]===T&&l[1]===s)return p[2]=l[2];if(c[o]=p,p[2]=e(t,n,u))return!0}return!1}}function xe(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r<i;r++)oe(e,t[r],n);return n}function we(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Te(e,t,n,r,i,o){return r&&!r[b]&&(r=Te(r)),i&&!i[b]&&(i=Te(i,o)),se(function(o,a,s,u){var l,c,f,p=[],d=[],h=a.length,g=o||be(t||"*",s.nodeType?[s]:s,[]),y=!e||!o&&t?g:we(g,p,e,s,u),v=n?i||(o?e:h||r)?[]:a:y;if(n&&n(y,v,s,u),r){l=we(v,d),r(l,[],s,u),c=l.length;while(c--)(f=l[c])&&(v[d[c]]=!(y[d[c]]=f))}if(o){if(i||e){if(i){l=[],c=v.length;while(c--)(f=v[c])&&l.push(y[c]=f);i(null,v=[],l,u)}c=v.length;while(c--)(f=v[c])&&(l=i?O(o,f):p[c])>-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u<o;u++)if(n=r.relative[e[u].type])p=[me(xe(p),n)];else{if((n=r.filter[e[u].type].apply(null,e[u].matches))[b]){for(i=++u;i<o;i++)if(r.relative[e[i].type])break;return Te(u>1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u<i&&Ce(e.slice(u,i)),i<o&&Ce(e=e.slice(i)),i<o&&ve(e))}p.push(n)}return xe(p)}function Ee(e,t){var n=t.length>0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t<r;t++)if(w.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)w.find(e,i[t],n);return r>1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(w.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&w(e);if(!D.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s<o.length)!1===o[s].apply(n[0],n[1])&&e.stopOnFalse&&(s=o.length,n=!1)}e.memory||(n=!1),t=!1,i&&(o=n?[]:"")},l={add:function(){return o&&(n&&!t&&(s=o.length-1,a.push(n)),function t(n){w.each(n,function(n,r){g(r)?e.unique&&l.has(r)||o.push(r):r&&r.length&&"string"!==x(r)&&t(r)})}(arguments),n&&!t&&u()),this},remove:function(){return w.each(arguments,function(e,t){var n;while((n=w.inArray(t,o,n))>-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t<o)){if((e=r.apply(s,u))===n.promise())throw new TypeError("Thenable self-resolution");l=e&&("object"==typeof e||"function"==typeof e)&&e.then,g(l)?i?l.call(e,a(o,n,I,i),a(o,n,W,i)):(o++,l.call(e,a(o,n,I,i),a(o,n,W,i),a(o,n,I,n.notifyWith))):(r!==I&&(s=void 0,u=[e]),(i||n.resolveWith)(s,u))}},c=i?l:function(){try{l()}catch(e){w.Deferred.exceptionHook&&w.Deferred.exceptionHook(e,c.stackTrace),t+1>=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},X=/^-ms-/,U=/-([a-z])/g;function V(e,t){return t.toUpperCase()}function G(e){return e.replace(X,"ms-").replace(U,V)}var Y=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Q(){this.expando=w.expando+Q.uid++}Q.uid=1,Q.prototype={cache:function(e){var t=e[this.expando];return t||(t={},Y(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[G(t)]=n;else for(r in t)i[G(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][G(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(G):(t=G(t))in r?[t]:t.match(M)||[]).length;while(n--)delete r[t[n]]}(void 0===t||w.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!w.isEmptyObject(t)}};var J=new Q,K=new Q,Z=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,ee=/[A-Z]/g;function te(e){return"true"===e||"false"!==e&&("null"===e?null:e===+e+""?+e:Z.test(e)?JSON.parse(e):e)}function ne(e,t,n){var r;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(ee,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n=te(n)}catch(e){}K.set(e,t,n)}else n=void 0;return n}w.extend({hasData:function(e){return K.hasData(e)||J.hasData(e)},data:function(e,t,n){return K.access(e,t,n)},removeData:function(e,t){K.remove(e,t)},_data:function(e,t,n){return J.access(e,t,n)},_removeData:function(e,t){J.remove(e,t)}}),w.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=K.get(o),1===o.nodeType&&!J.get(o,"hasDataAttrs"))){n=a.length;while(n--)a[n]&&0===(r=a[n].name).indexOf("data-")&&(r=G(r.slice(5)),ne(o,r,i[r]));J.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof e?this.each(function(){K.set(this,e)}):z(this,function(t){var n;if(o&&void 0===t){if(void 0!==(n=K.get(o,e)))return n;if(void 0!==(n=ne(o,e)))return n}else this.each(function(){K.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?w.queue(this[0],e):void 0===t?this:this.each(function(){var n=w.queue(this,e,t);w._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&w.dequeue(this,e)})},dequeue:function(e){return this.each(function(){w.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=w.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=J.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var re=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ie=new RegExp("^(?:([+-])=|)("+re+")([a-z%]*)$","i"),oe=["Top","Right","Bottom","Left"],ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&w.contains(e.ownerDocument,e)&&"none"===w.css(e,"display")},se=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i};function ue(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return w.css(e,t,"")},u=s(),l=n&&n[3]||(w.cssNumber[t]?"":"px"),c=(w.cssNumber[t]||"px"!==l&&+u)&&ie.exec(w.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)w.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,w.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var le={};function ce(e){var t,n=e.ownerDocument,r=e.nodeName,i=le[r];return i||(t=n.body.appendChild(n.createElement(r)),i=w.css(t,"display"),t.parentNode.removeChild(t),"none"===i&&(i="block"),le[r]=i,i)}function fe(e,t){for(var n,r,i=[],o=0,a=e.length;o<a;o++)(r=e[o]).style&&(n=r.style.display,t?("none"===n&&(i[o]=J.get(r,"display")||null,i[o]||(r.style.display="")),""===r.style.display&&ae(r)&&(i[o]=ce(r))):"none"!==n&&(i[o]="none",J.set(r,"display",n)));for(o=0;o<a;o++)null!=i[o]&&(e[o].style.display=i[o]);return e}w.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?w(this).show():w(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n<r;n++)J.set(e[n],"globalEval",!t||J.get(t[n],"globalEval"))}var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===x(o))w.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+w.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;w.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&w.inArray(o,r)>-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="<textarea>x</textarea>",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n<arguments.length;n++)u[n]=arguments[n];if(t.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,t)){s=w.event.handlers.call(this,t,l),n=0;while((o=s[n++])&&!t.isPropagationStopped()){t.currentTarget=o.elem,r=0;while((a=o.handlers[r++])&&!t.isImmediatePropagationStopped())t.rnamespace&&!t.rnamespace.test(a.namespace)||(t.handleObj=a,t.data=a.data,void 0!==(i=((w.event.special[a.origType]||{}).handle||a.handler).apply(o.elem,u))&&!1===(t.result=i)&&(t.preventDefault(),t.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,t),t.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&e.button>=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?w(i,this).index(l)>-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(e,t){Object.defineProperty(w.Event.prototype,e,{enumerable:!0,configurable:!0,get:g(t)?function(){if(this.originalEvent)return t(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[e]},set:function(t){Object.defineProperty(this,e,{enumerable:!0,configurable:!0,writable:!0,value:t})}})},fix:function(e){return e[w.expando]?e:new w.Event(e)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==Se()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===Se()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&N(this,"input"))return this.click(),!1},_default:function(e){return N(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},w.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},w.Event=function(e,t){if(!(this instanceof w.Event))return new w.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ee:ke,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&w.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[w.expando]=!0},w.Event.prototype={constructor:w.Event,isDefaultPrevented:ke,isPropagationStopped:ke,isImmediatePropagationStopped:ke,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ee,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ee,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ee,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},w.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&we.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Te.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},w.event.addProp),w.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){w.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||w.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),w.fn.extend({on:function(e,t,n,r){return De(this,e,t,n,r)},one:function(e,t,n,r){return De(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,w(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=ke),this.each(function(){w.event.remove(this,e,n,t)})}});var Ne=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/<script|<style|<link/i,je=/checked\s*(?:[^=]|=\s*.checked.)/i,qe=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n<r;n++)w.event.add(t,i,l[i][n])}K.hasData(e)&&(s=K.access(e),u=w.extend({},s),K.set(t,u))}}function Me(e,t){var n=t.nodeName.toLowerCase();"input"===n&&pe.test(e.type)?t.checked=e.checked:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}function Re(e,t,n,r){t=a.apply([],t);var i,o,s,u,l,c,f=0,p=e.length,d=p-1,y=t[0],v=g(y);if(v||p>1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f<p;f++)l=i,f!==d&&(l=w.clone(l,!0,!0),u&&w.merge(s,ye(l,"script"))),n.call(e[f],l,f);if(u)for(c=s[s.length-1].ownerDocument,w.map(s,Oe),f=0;f<u;f++)l=s[f],he.test(l.type||"")&&!J.access(l,"globalEval")&&w.contains(c,l)&&(l.src&&"module"!==(l.type||"").toLowerCase()?w._evalUrl&&w._evalUrl(l.src):m(l.textContent.replace(qe,""),c,l))}return e}function Ie(e,t,n){for(var r,i=t?w.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||w.cleanData(ye(r)),r.parentNode&&(n&&w.contains(r.ownerDocument,r)&&ve(ye(r,"script")),r.parentNode.removeChild(r));return e}w.extend({htmlPrefilter:function(e){return e.replace(Ne,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r<i;r++)Me(o[r],a[r]);if(t)if(n)for(o=o||ye(e),a=a||ye(s),r=0,i=o.length;r<i;r++)Pe(o[r],a[r]);else Pe(e,s);return(a=ye(s,"script")).length>0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(w.cleanData(ye(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return Re(this,arguments,function(t){var n=this.parentNode;w.inArray(this,e)<0&&(w.cleanData(ye(this)),n&&n.replaceChild(t,this))},e)}}),w.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){w.fn[e]=function(e){for(var n,r=[],i=w(e),o=i.length-1,a=0;a<=o;a++)n=a===o?this:this.clone(!0),w(i[a])[t](n),s.apply(r,n.get());return this.pushStack(r)}});var We=new RegExp("^("+re+")(?!px)[a-z%]+$","i"),$e=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},Be=new RegExp(oe.join("|"),"i");!function(){function t(){if(c){l.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",c.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",be.appendChild(l).appendChild(c);var t=e.getComputedStyle(c);i="1%"!==t.top,u=12===n(t.marginLeft),c.style.right="60%",s=36===n(t.right),o=36===n(t.width),c.style.position="absolute",a=36===c.offsetWidth||"absolute",be.removeChild(l),c=null}}function n(e){return Math.round(parseFloat(e))}var i,o,a,s,u,l=r.createElement("div"),c=r.createElement("div");c.style&&(c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",h.clearCloneStyle="content-box"===c.style.backgroundClip,w.extend(h,{boxSizingReliable:function(){return t(),o},pixelBoxStyles:function(){return t(),s},pixelPosition:function(){return t(),i},reliableMarginLeft:function(){return t(),u},scrollboxSize:function(){return t(),a}}))}();function Fe(e,t,n){var r,i,o,a,s=e.style;return(n=n||$e(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||w.contains(e.ownerDocument,e)||(a=w.style(e,t)),!h.pixelBoxStyles()&&We.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function _e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}var ze=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ue={position:"absolute",visibility:"hidden",display:"block"},Ve={letterSpacing:"0",fontWeight:"400"},Ge=["Webkit","Moz","ms"],Ye=r.createElement("div").style;function Qe(e){if(e in Ye)return e;var t=e[0].toUpperCase()+e.slice(1),n=Ge.length;while(n--)if((e=Ge[n]+t)in Ye)return e}function Je(e){var t=w.cssProps[e];return t||(t=w.cssProps[e]=Qe(e)||e),t}function Ke(e,t,n){var r=ie.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ze(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=w.css(e,n+oe[a],!0,i)),r?("content"===n&&(u-=w.css(e,"padding"+oe[a],!0,i)),"margin"!==n&&(u-=w.css(e,"border"+oe[a]+"Width",!0,i))):(u+=w.css(e,"padding"+oe[a],!0,i),"padding"!==n?u+=w.css(e,"border"+oe[a]+"Width",!0,i):s+=w.css(e,"border"+oe[a]+"Width",!0,i));return!r&&o>=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a<i;a++)o[t[a]]=w.css(e,t[a],!1,r);return o}return void 0!==n?w.style(e,t,n):w.css(e,t)},e,t,arguments.length>1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ct(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),y=J.get(e,"fxshow");n.queue||(null==(a=w._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,w.queue(e,"fx").length||a.empty.fire()})}));for(r in t)if(i=t[r],it.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!y||void 0===y[r])continue;g=!0}d[r]=y&&y[r]||w.style(e,r)}if((u=!w.isEmptyObject(t))||!w.isEmptyObject(d)){f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=y&&y.display)&&(l=J.get(e,"display")),"none"===(c=w.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=w.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===w.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1;for(r in d)u||(y?"hidden"in y&&(g=y.hidden):y=J.access(e,"fxshow",{display:l}),o&&(y.hidden=!g),g&&fe([e],!0),p.done(function(){g||fe([e]),J.remove(e,"fxshow");for(r in d)w.style(e,r,d[r])})),u=lt(g?y[r]:0,r,p),r in y||(y[r]=u.start,g&&(u.end=u.start,u.start=0))}}function ft(e,t){var n,r,i,o,a;for(n in e)if(r=G(n),i=t[r],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=w.cssHooks[r])&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function pt(e,t,n){var r,i,o=0,a=pt.prefilters.length,s=w.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=nt||st(),n=Math.max(0,l.startTime+l.duration-t),r=1-(n/l.duration||0),o=0,a=l.tweens.length;o<a;o++)l.tweens[o].run(r);return s.notifyWith(e,[l,r,n]),r<1&&a?n:(a||s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:w.extend({},t),opts:w.extend(!0,{specialEasing:{},easing:w.easing._default},n),originalProperties:t,originalOptions:n,startTime:nt||st(),duration:n.duration,tweens:[],createTween:function(t,n){var r=w.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(ft(c,l.opts.specialEasing);o<a;o++)if(r=pt.prefilters[o].call(l,e,c,l.opts))return g(r.stop)&&(w._queueHooks(l.elem,l.opts.queue).stop=r.stop.bind(r)),r;return w.map(c,lt,l),g(l.opts.start)&&l.opts.start.call(e,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),w.fx.timer(w.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l}w.Animation=w.extend(pt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return ue(n.elem,e,ie.exec(t),n),n}]},tweener:function(e,t){g(e)?(t=e,e=["*"]):e=e.match(M);for(var n,r=0,i=e.length;r<i;r++)n=e[r],pt.tweeners[n]=pt.tweeners[n]||[],pt.tweeners[n].unshift(t)},prefilters:[ct],prefilter:function(e,t){t?pt.prefilters.unshift(e):pt.prefilters.push(e)}}),w.speed=function(e,t,n){var r=e&&"object"==typeof e?w.extend({},e):{complete:n||!n&&t||g(e)&&e,duration:e,easing:n&&t||t&&!g(t)&&t};return w.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in w.fx.speeds?r.duration=w.fx.speeds[r.duration]:r.duration=w.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){g(r.old)&&r.old.call(this),r.queue&&w.dequeue(this,r.queue)},r},w.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=w.isEmptyObject(e),o=w.speed(t,n,r),a=function(){var t=pt(this,w.extend({},e),o);(i||J.get(this,"finish"))&&t.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&!1!==e&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=w.timers,a=J.get(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&ot.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||w.dequeue(this,e)})},finish:function(e){return!1!==e&&(e=e||"fx"),this.each(function(){var t,n=J.get(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=w.timers,a=r?r.length:0;for(n.finish=!0,w.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),w.each(["toggle","show","hide"],function(e,t){var n=w.fn[t];w.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ut(t,!0),e,r,i)}}),w.each({slideDown:ut("show"),slideUp:ut("hide"),slideToggle:ut("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){w.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),w.timers=[],w.fx.tick=function(){var e,t=0,n=w.timers;for(nt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||w.fx.stop(),nt=void 0},w.fx.timer=function(e){w.timers.push(e),w.fx.start()},w.fx.interval=13,w.fx.start=function(){rt||(rt=!0,at())},w.fx.stop=function(){rt=null},w.fx.speeds={slow:600,fast:200,_default:400},w.fn.delay=function(t,n){return t=w.fx?w.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e=r.createElement("input"),t=r.createElement("select").appendChild(r.createElement("option"));e.type="checkbox",h.checkOn=""!==e.value,h.optSelected=t.selected,(e=r.createElement("input")).value="t",e.type="radio",h.radioValue="t"===e.value}();var dt,ht=w.expr.attrHandle;w.fn.extend({attr:function(e,t){return z(this,w.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!N(n.parentNode,"optgroup"))){if(t=w(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=w.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=w.inArray(w.valHooks.option.get(r),o)>-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w("<script>").prop({charset:e.scriptCharset,src:e.url}).on("load error",n=function(e){t.remove(),n=null,e&&o("error"===e.type?404:200,e.type)}),r.head.appendChild(t[0])},abort:function(){n&&n()}}}});var Yt=[],Qt=/(=)\?(?=&|$)|\?\?/;w.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Yt.pop()||w.expando+"_"+Et++;return this[e]=!0,e}}),w.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=!1!==t.jsonp&&(Qt.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&Qt.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=g(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(Qt,"$1"+i):!1!==t.jsonp&&(t.url+=(kt.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||w.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?w(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,Yt.push(i)),a&&g(o)&&o(a[0]),a=o=void 0}),"script"}),h.createHTMLDocument=function(){var e=r.implementation.createHTMLDocument("").body;return e.innerHTML="<form></form><form></form>",2===e.childNodes.length}(),w.parseHTML=function(e,t,n){if("string"!=typeof e)return[];"boolean"==typeof t&&(n=t,t=!1);var i,o,a;return t||(h.createHTMLDocument?((i=(t=r.implementation.createHTMLDocument("")).createElement("base")).href=r.location.href,t.head.appendChild(i)):t=r),o=A.exec(e),a=!n&&[],o?[t.createElement(o[1])]:(o=xe([e],t,a),a&&a.length&&w(a).remove(),w.merge([],o.childNodes))},w.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=vt(e.slice(s)),e=e.slice(0,s)),g(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&w.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?w("<div>").append(w.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},w.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){w.fn[t]=function(e){return this.on(t,e)}}),w.expr.pseudos.animated=function(e){return w.grep(w.timers,function(t){return e===t.elem}).length},w.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=w.css(e,"position"),f=w(e),p={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=w.css(e,"top"),u=w.css(e,"left"),(l=("absolute"===c||"fixed"===c)&&(o+u).indexOf("auto")>-1)?(a=(r=f.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),g(t)&&(t=t.call(e,n,w.extend({},s))),null!=t.top&&(p.top=t.top-s.top+a),null!=t.left&&(p.left=t.left-s.left+i),"using"in t?t.using.call(e,p):f.css(p)}},w.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){w.offset.setOffset(this,e,t)});var t,n,r=this[0];if(r)return r.getClientRects().length?(t=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:t.top+n.pageYOffset,left:t.left+n.pageXOffset}):{top:0,left:0}},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===w.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===w.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=w(e).offset()).top+=w.css(e,"borderTopWidth",!0),i.left+=w.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-w.css(r,"marginTop",!0),left:t.left-i.left-w.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===w.css(e,"position"))e=e.offsetParent;return e||be})}}),w.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n="pageYOffset"===t;w.fn[e]=function(r){return z(this,function(e,r,i){var o;if(y(e)?o=e:9===e.nodeType&&(o=e.defaultView),void 0===i)return o?o[t]:e[r];o?o.scrollTo(n?o.pageXOffset:i,n?i:o.pageYOffset):e[r]=i},e,r,arguments.length)}}),w.each(["top","left"],function(e,t){w.cssHooks[t]=_e(h.pixelPosition,function(e,n){if(n)return n=Fe(e,t),We.test(n)?w(e).position()[t]+"px":n})}),w.each({Height:"height",Width:"width"},function(e,t){w.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){w.fn[r]=function(i,o){var a=arguments.length&&(n||"boolean"!=typeof i),s=n||(!0===i||!0===o?"margin":"border");return z(this,function(t,n,i){var o;return y(t)?0===r.indexOf("outer")?t["inner"+e]:t.document.documentElement["client"+e]:9===t.nodeType?(o=t.documentElement,Math.max(t.body["scroll"+e],o["scroll"+e],t.body["offset"+e],o["offset"+e],o["client"+e])):void 0===i?w.css(t,n,s):w.style(t,n,i,s)},t,a?i:void 0,a)}})}),w.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,t){w.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),w.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),w.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),w.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),g(e))return r=o.call(arguments,2),i=function(){return e.apply(t||this,r.concat(o.call(arguments)))},i.guid=e.guid=e.guid||w.guid++,i},w.holdReady=function(e){e?w.readyWait++:w.ready(!0)},w.isArray=Array.isArray,w.parseJSON=JSON.parse,w.nodeName=N,w.isFunction=g,w.isWindow=y,w.camelCase=G,w.type=x,w.now=Date.now,w.isNumeric=function(e){var t=w.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return w});var Jt=e.jQuery,Kt=e.$;return w.noConflict=function(t){return e.$===w&&(e.$=Kt),t&&e.jQuery===w&&(e.jQuery=Jt),w},t||(e.jQuery=e.$=w),w});
diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
new file mode 100644
index 000000000..b578b1277
--- /dev/null
+++ b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -0,0 +1,3200 @@
+/* ajv 6.5.0: Another JSON Schema Validator */
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).Ajv=e()}}(function(){return function o(i,n,l){function u(r,e){if(!n[r]){if(!i[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(c)return c(r,!0);var a=new Error("Cannot find module '"+r+"'");throw a.code="MODULE_NOT_FOUND",a}var s=n[r]={exports:{}};i[r][0].call(s.exports,function(e){return u(i[r][1][e]||e)},s,s.exports,o,i,n,l)}return n[r].exports}for(var c="function"==typeof require&&require,e=0;e<l.length;e++)u(l[e]);return u}({1:[function(e,r,t){"use strict";var a=r.exports=function(){this._cache={}};a.prototype.put=function(e,r){this._cache[e]=r},a.prototype.get=function(e){return this._cache[e]},a.prototype.del=function(e){delete this._cache[e]},a.prototype.clear=function(){this._cache={}}},{}],2:[function(e,r,t){"use strict";var s=e("./error_classes").MissingRef;r.exports=function t(r,i,a){var n=this;if("function"!=typeof this._opts.loadSchema)throw new Error("options.loadSchema should be a function");"function"==typeof i&&(a=i,i=void 0);var e=l(r).then(function(){var e=n._addSchema(r,void 0,i);return e.validate||function(o){try{return n._compile(o)}catch(e){if(e instanceof s)return function(e){var r=e.missingSchema;if(s(r))throw new Error("Schema "+r+" is loaded but "+e.missingRef+" cannot be resolved");var t=n._loadingSchemas[r];t||(t=n._loadingSchemas[r]=n._opts.loadSchema(r)).then(a,a);return t.then(function(e){if(!s(r))return l(e).then(function(){s(r)||n.addSchema(e,r,void 0,i)})}).then(function(){return u(o)});function a(){delete n._loadingSchemas[r]}function s(e){return n._refs[e]||n._schemas[e]}}(e);throw e}}(e)});a&&e.then(function(e){a(null,e)},a);return e;function l(e){var r=e.$schema;return r&&!n.getSchema(r)?t.call(n,{$ref:r},!0):Promise.resolve()}function u(o){try{return n._compile(o)}catch(e){if(e instanceof s)return function(e){var r=e.missingSchema;if(s(r))throw new Error("Schema "+r+" is loaded but "+e.missingRef+" cannot be resolved");var t=n._loadingSchemas[r];t||(t=n._loadingSchemas[r]=n._opts.loadSchema(r)).then(a,a);return t.then(function(e){if(!s(r))return l(e).then(function(){s(r)||n.addSchema(e,r,void 0,i)})}).then(function(){return u(o)});function a(){delete n._loadingSchemas[r]}function s(e){return n._refs[e]||n._schemas[e]}}(e);throw e}}}},{"./error_classes":3}],3:[function(e,r,t){"use strict";var a=e("./resolve");function s(e,r,t){this.message=t||s.message(e,r),this.missingRef=a.url(e,r),this.missingSchema=a.normalizeId(a.fullPath(this.missingRef))}function o(e){return e.prototype=Object.create(Error.prototype),e.prototype.constructor=e}r.exports={Validation:o(function(e){this.message="validation failed",this.errors=e,this.ajv=this.validation=!0}),MissingRef:o(s)},s.message=function(e,r){return"can't resolve reference "+r+" from id "+e}},{"./resolve":6}],4:[function(e,r,t){"use strict";var a=e("./util"),o=/^(\d\d\d\d)-(\d\d)-(\d\d)$/,i=[0,31,28,31,30,31,30,31,31,30,31,30,31],n=/^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d:\d\d)?$/i,s=/^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*$/i,l=/^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i,u=/^(?:(?:[^\x00-\x20"'<>%\\^`{|}]|%[0-9a-f]{2})|\{[+#./;?&=,!@|]?(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?(?:,(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?)*\})*$/i,c=/^(?:(?:http[s\u017F]?|ftp):\/\/)(?:(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+(?::(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?@)?(?:(?!10(?:\.[0-9]{1,3}){3})(?!127(?:\.[0-9]{1,3}){3})(?!169\.254(?:\.[0-9]{1,3}){2})(?!192\.168(?:\.[0-9]{1,3}){2})(?!172\.(?:1[6-9]|2[0-9]|3[01])(?:\.[0-9]{1,3}){2})(?:[1-9][0-9]?|1[0-9][0-9]|2[01][0-9]|22[0-3])(?:\.(?:1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])){2}(?:\.(?:[1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-4]))|(?:(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)(?:\.(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)*(?:\.(?:(?:[KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]){2,})))(?::[0-9]{2,5})?(?:\/(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?$/i,h=/^(?:urn:uuid:)?[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i,d=/^(?:\/(?:[^~/]|~0|~1)*)*$/,f=/^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i,p=/^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;function m(e){return a.copy(m[e="full"==e?"full":"fast"])}function v(e){var r=e.match(o);if(!r)return!1;var t,a=+r[2],s=+r[3];return 1<=a&&a<=12&&1<=s&&s<=(2!=a||((t=+r[1])%4!=0||t%100==0&&t%400!=0)?i[a]:29)}function g(e,r){var t=e.match(n);if(!t)return!1;var a=t[1],s=t[2],o=t[3];return(a<=23&&s<=59&&o<=59||23==a&&59==s&&60==o)&&(!r||t[5])}(r.exports=m).fast={date:/^\d\d\d\d-[0-1]\d-[0-3]\d$/,time:/^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,"date-time":/^\d\d\d\d-[0-1]\d-[0-3]\d[t\s](?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d:\d\d)$/i,uri:/^(?:[a-z][a-z0-9+-.]*:)(?:\/?\/)?[^\s]*$/i,"uri-reference":/^(?:(?:[a-z][a-z0-9+-.]*:)?\/?\/)?(?:[^\\\s#][^\s#]*)?(?:#[^\\\s]*)?$/i,"uri-template":u,url:c,email:/^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$/i,hostname:s,ipv4:/^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,ipv6:/^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,regex:w,uuid:h,"json-pointer":d,"json-pointer-uri-fragment":f,"relative-json-pointer":p},m.full={date:v,time:g,"date-time":function(e){var r=e.split(y);return 2==r.length&&v(r[0])&&g(r[1],!0)},uri:function(e){return P.test(e)&&l.test(e)},"uri-reference":/^(?:[a-z][a-z0-9+\-.]*:)?(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'"()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?(?:\?(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i,"uri-template":u,url:c,email:/^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&''*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i,hostname:function(e){return e.length<=255&&s.test(e)},ipv4:/^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,ipv6:/^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,regex:w,uuid:h,"json-pointer":d,"json-pointer-uri-fragment":f,"relative-json-pointer":p};var y=/t|\s/i;var P=/\/|:/;var E=/[^\\]\\Z/;function w(e){if(E.test(e))return!1;try{return new RegExp(e),!0}catch(e){return!1}}},{"./util":10}],5:[function(e,r,t){"use strict";var $=e("./resolve"),D=e("./util"),j=e("./error_classes"),l=e("fast-json-stable-stringify"),I=e("../dotjs/validate"),O=D.ucs2length,A=e("fast-deep-equal"),C=j.Validation;function k(e,r,t){for(var a=0;a<this._compilations.length;a++){var s=this._compilations[a];if(s.schema==e&&s.root==r&&s.baseId==t)return a}return-1}function L(e,r){return"var pattern"+e+" = new RegExp("+D.toQuotedString(r[e])+");"}function z(e){return"var default"+e+" = defaults["+e+"];"}function T(e,r){return void 0===r[e]?"":"var refVal"+e+" = refVal["+e+"];"}function N(e){return"var customRule"+e+" = customRules["+e+"];"}function q(e,r){if(!e.length)return"";for(var t="",a=0;a<e.length;a++)t+=r(a,e);return t}r.exports=function u(e,c,h,r){var d=this,f=this._opts,p=[void 0],m={},v=[],t={},g=[],a={},y=[];c=c||{schema:e,refVal:p,refs:m};var s=function(e,r,t){var a=k.call(this,e,r,t);return 0<=a?{index:a,compiling:!0}:{index:a=this._compilations.length,compiling:(this._compilations[a]={schema:e,root:r,baseId:t},!1)}}.call(this,e,c,r);var o=this._compilations[s.index];if(s.compiling)return o.callValidate=function e(){var r=o.validate;var t=r.apply(this,arguments);e.errors=r.errors;return t};var P=this._formats;var E=this.RULES;try{var i=w(e,c,h,r);o.validate=i;var n=o.callValidate;return n&&(n.schema=i.schema,n.errors=null,n.refs=i.refs,n.refVal=i.refVal,n.root=i.root,n.$async=i.$async,f.sourceCode&&(n.source=i.source)),i}finally{(function(e,r,t){var a=k.call(this,e,r,t);0<=a&&this._compilations.splice(a,1)}).call(this,e,c,r)}function w(e,r,t,a){var s=!r||r&&r.schema==e;if(r.schema!=c.schema)return u.call(d,e,r,t,a);var o,i=!0===e.$async,n=I({isTop:!0,schema:e,isRoot:s,baseId:a,root:r,schemaPath:"",errSchemaPath:"#",errorPath:'""',MissingRefError:j.MissingRef,RULES:E,validate:I,util:D,resolve:$,resolveRef:S,usePattern:F,useDefault:x,useCustomRule:R,opts:f,formats:P,logger:d.logger,self:d});n=q(p,T)+q(v,L)+q(g,z)+q(y,N)+n,f.processCode&&(n=f.processCode(n));try{var l=new Function("self","RULES","formats","root","refVal","defaults","customRules","equal","ucs2length","ValidationError",n);o=l(d,E,P,c,p,g,y,A,O,C),p[0]=o}catch(e){throw d.logger.error("Error compiling schema, function code:",n),e}return o.schema=e,o.errors=null,o.refs=m,o.refVal=p,o.root=s?o:r,i&&(o.$async=!0),!0===f.sourceCode&&(o.source={code:n,patterns:v,defaults:g}),o}function S(e,r,t){r=$.url(e,r);var a,s,o=m[r];if(void 0!==o)return _(a=p[o],s="refVal["+o+"]");if(!t&&c.refs){var i=c.refs[r];if(void 0!==i)return s=b(r,a=c.refVal[i]),_(a,s)}s=b(r);var n=$.call(d,w,c,r);if(void 0===n){var l=h&&h[r];l&&(n=$.inlineRef(l,f.inlineRefs)?l:u.call(d,l,c,h,e))}if(void 0!==n)return p[m[r]]=n,_(n,s);delete m[r]}function b(e,r){var t=p.length;return p[t]=r,"refVal"+(m[e]=t)}function _(e,r){return"object"==typeof e||"boolean"==typeof e?{code:r,schema:e,inline:!0}:{code:r,$async:e&&!!e.$async}}function F(e){var r=t[e];return void 0===r&&(r=t[e]=v.length,v[r]=e),"pattern"+r}function x(e){switch(typeof e){case"boolean":case"number":return""+e;case"string":return D.toQuotedString(e);case"object":if(null===e)return"null";var r=l(e),t=a[r];return void 0===t&&(t=a[r]=g.length,g[t]=e),"default"+t}}function R(e,r,t,a){var s=e.definition.validateSchema;if(s&&!1!==d._opts.validateSchema){var o=s(r);if(!o){var i="keyword schema is invalid: "+d.errorsText(s.errors);if("log"!=d._opts.validateSchema)throw new Error(i);d.logger.error(i)}}var n,l=e.definition.compile,u=e.definition.inline,c=e.definition.macro;if(l)n=l.call(d,r,t,a);else if(c)n=c.call(d,r,t,a),!1!==f.validateSchema&&d.validateSchema(n,!0);else if(u)n=u.call(d,a,e.keyword,r,t);else if(!(n=e.definition.validate))return;if(void 0===n)throw new Error('custom keyword "'+e.keyword+'"failed to compile');var h=y.length;return{code:"customRule"+h,validate:y[h]=n}}}},{"../dotjs/validate":37,"./error_classes":3,"./resolve":6,"./util":10,"fast-deep-equal":41,"fast-json-stable-stringify":42}],6:[function(e,r,t){"use strict";var m=e("uri-js"),v=e("fast-deep-equal"),g=e("./util"),l=e("./schema_obj"),a=e("json-schema-traverse");function u(e,r,t){var a=this._refs[t];if("string"==typeof a){if(!this._refs[a])return u.call(this,e,r,a);a=this._refs[a]}if((a=a||this._schemas[t])instanceof l)return d(a.schema,this._opts.inlineRefs)?a.schema:a.validate||this._compile(a);var s,o,i,n=c.call(this,r,t);return n&&(s=n.schema,r=n.root,i=n.baseId),s instanceof l?o=s.validate||e.call(this,s.schema,r,void 0,i):void 0!==s&&(o=d(s,this._opts.inlineRefs)?s:e.call(this,s,r,void 0,i)),o}function c(e,r){var t=m.parse(r),a=f(t),s=y(this._getId(e.schema));if(a!==s){var o=P(a),i=this._refs[o];if("string"==typeof i)return function(e,r,t){var a=c.call(this,e,r);if(a){var s=a.schema,o=a.baseId;e=a.root;var i=this._getId(s);return i&&(o=p(o,i)),n.call(this,t,o,s,e)}}.call(this,e,i,t);if(i instanceof l)i.validate||this._compile(i),e=i;else{if(!((i=this._schemas[o])instanceof l))return;if(i.validate||this._compile(i),o==P(r))return{schema:i,root:e,baseId:s};e=i}if(!e.schema)return;s=y(this._getId(e.schema))}return n.call(this,t,s,e.schema,e)}(r.exports=u).normalizeId=P,u.fullPath=y,u.url=p,u.ids=function(e){var r=P(this._getId(e)),h={"":r},d={"":y(r,!1)},f={},p=this;return a(e,{allKeys:!0},function(e,r,t,a,s,o,i){if(""!==r){var n=p._getId(e),l=h[a],u=d[a]+"/"+s;if(void 0!==i&&(u+="/"+("number"==typeof i?i:g.escapeFragment(i))),"string"==typeof n){n=l=P(l?m.resolve(l,n):n);var c=p._refs[n];if("string"==typeof c&&(c=p._refs[c]),c&&c.schema){if(!v(e,c.schema))throw new Error('id "'+n+'" resolves to more than one schema')}else if(n!=P(u))if("#"==n[0]){if(f[n]&&!v(e,f[n]))throw new Error('id "'+n+'" resolves to more than one schema');f[n]=e}else p._refs[n]=u}h[r]=l,d[r]=u}}),f},u.inlineRef=d,u.schema=c;var h=g.toHash(["properties","patternProperties","enum","dependencies","definitions"]);function n(e,r,t,a){if(e.fragment=e.fragment||"","/"==e.fragment.slice(0,1)){for(var s=e.fragment.split("/"),o=1;o<s.length;o++){var i=s[o];if(i){if(void 0===(t=t[i=g.unescapeFragment(i)]))break;var n;if(!h[i]&&((n=this._getId(t))&&(r=p(r,n)),t.$ref)){var l=p(r,t.$ref),u=c.call(this,a,l);u&&(t=u.schema,a=u.root,r=u.baseId)}}}return void 0!==t&&t!==a.schema?{schema:t,root:a,baseId:r}:void 0}}var i=g.toHash(["type","format","pattern","maxLength","minLength","maxProperties","minProperties","maxItems","minItems","maximum","minimum","uniqueItems","multipleOf","required","enum"]);function d(e,r){return!1!==r&&(void 0===r||!0===r?function e(r){var t;if(Array.isArray(r)){for(var a=0;a<r.length;a++)if("object"==typeof(t=r[a])&&!e(t))return!1}else for(var s in r){if("$ref"==s)return!1;if("object"==typeof(t=r[s])&&!e(t))return!1}return!0}(e):r?function e(r){var t,a=0;if(Array.isArray(r)){for(var s=0;s<r.length;s++)if("object"==typeof(t=r[s])&&(a+=e(t)),a==1/0)return 1/0}else for(var o in r){if("$ref"==o)return 1/0;if(i[o])a++;else if("object"==typeof(t=r[o])&&(a+=e(t)+1),a==1/0)return 1/0}return a}(e)<=r:void 0)}function y(e,r){return!1!==r&&(e=P(e)),f(m.parse(e))}function f(e){return m.serialize(e).split("#")[0]+"#"}var s=/#\/?$/;function P(e){return e?e.replace(s,""):""}function p(e,r){return r=P(r),m.resolve(e,r)}},{"./schema_obj":8,"./util":10,"fast-deep-equal":41,"json-schema-traverse":43,"uri-js":44}],7:[function(e,r,t){"use strict";var o=e("../dotjs"),i=e("./util").toHash;r.exports=function(){var a=[{type:"number",rules:[{maximum:["exclusiveMaximum"]},{minimum:["exclusiveMinimum"]},"multipleOf","format"]},{type:"string",rules:["maxLength","minLength","pattern","format"]},{type:"array",rules:["maxItems","minItems","items","contains","uniqueItems"]},{type:"object",rules:["maxProperties","minProperties","required","dependencies","propertyNames",{properties:["additionalProperties","patternProperties"]}]},{rules:["$ref","const","enum","not","anyOf","oneOf","allOf","if"]}],s=["type","$comment"];return a.all=i(s),a.types=i(["number","integer","string","array","object","boolean","null"]),a.forEach(function(e){e.rules=e.rules.map(function(e){var r;if("object"==typeof e){var t=Object.keys(e)[0];r=e[t],e=t,r.forEach(function(e){s.push(e),a.all[e]=!0})}return s.push(e),a.all[e]={keyword:e,code:o[e],implements:r}}),a.all.$comment={keyword:"$comment",code:o.$comment},e.type&&(a.types[e.type]=e)}),a.keywords=i(s.concat(["$schema","$id","id","$data","title","description","default","definitions","examples","readOnly","writeOnly","contentMediaType","contentEncoding","additionalItems","then","else"])),a.custom={},a}},{"../dotjs":26,"./util":10}],8:[function(e,r,t){"use strict";var a=e("./util");r.exports=function(e){a.copy(e,this)}},{"./util":10}],9:[function(e,r,t){"use strict";r.exports=function(e){for(var r,t=0,a=e.length,s=0;s<a;)t++,55296<=(r=e.charCodeAt(s++))&&r<=56319&&s<a&&56320==(64512&(r=e.charCodeAt(s)))&&s++;return t}},{}],10:[function(e,r,t){"use strict";function o(e,r,t){var a=t?" !== ":" === ",s=t?" || ":" && ",o=t?"!":"",i=t?"":"!";switch(e){case"null":return r+a+"null";case"array":return o+"Array.isArray("+r+")";case"object":return"("+o+r+s+"typeof "+r+a+'"object"'+s+i+"Array.isArray("+r+"))";case"integer":return"(typeof "+r+a+'"number"'+s+i+"("+r+" % 1)"+s+r+a+r+")";default:return"typeof "+r+a+'"'+e+'"'}}r.exports={copy:function(e,r){for(var t in r=r||{},e)r[t]=e[t];return r},checkDataType:o,checkDataTypes:function(e,r){switch(e.length){case 1:return o(e[0],r,!0);default:var t="",a=n(e);for(var s in a.array&&a.object&&(t=a.null?"(":"(!"+r+" || ",t+="typeof "+r+' !== "object")',delete a.null,delete a.array,delete a.object),a.number&&delete a.integer,a)t+=(t?" && ":"")+o(s,r,!0);return t}},coerceToTypes:function(e,r){if(Array.isArray(r)){for(var t=[],a=0;a<r.length;a++){var s=r[a];i[s]?t[t.length]=s:"array"===e&&"array"===s&&(t[t.length]=s)}if(t.length)return t}else{if(i[r])return[r];if("array"===e&&"array"===r)return["array"]}},toHash:n,getProperty:h,escapeQuotes:l,equal:e("fast-deep-equal"),ucs2length:e("./ucs2length"),varOccurences:function(e,r){var t=e.match(new RegExp(r+="[^0-9]","g"));return t?t.length:0},varReplace:function(e,r,t){return r+="([^0-9])",t=t.replace(/\$/g,"$$$$"),e.replace(new RegExp(r,"g"),t+"$1")},cleanUpCode:function(e){return e.replace(u,"").replace(c,"").replace(d,"if (!($1))")},finalCleanUpCode:function(e,r){var t=e.match(f);t&&2==t.length&&(e=r?e.replace(m,"").replace(y,P):e.replace(p,"").replace(v,g));return(t=e.match(E))&&3===t.length?e.replace(w,""):e},schemaHasRules:function(e,r){if("boolean"==typeof e)return!e;for(var t in e)if(r[t])return!0},schemaHasRulesExcept:function(e,r,t){if("boolean"==typeof e)return!e&&"not"!=t;for(var a in e)if(a!=t&&r[a])return!0},toQuotedString:S,getPathExpr:function(e,r,t,a){return F(e,t?"'/' + "+r+(a?"":".replace(/~/g, '~0').replace(/\\//g, '~1')"):a?"'[' + "+r+" + ']'":"'[\\'' + "+r+" + '\\']'")},getPath:function(e,r,t){var a=S(t?"/"+x(r):h(r));return F(e,a)},getData:function(e,r,t){var a,s,o,i;if(""===e)return"rootData";if("/"==e[0]){if(!b.test(e))throw new Error("Invalid JSON-pointer: "+e);s=e,o="rootData"}else{if(!(i=e.match(_)))throw new Error("Invalid JSON-pointer: "+e);if(a=+i[1],"#"==(s=i[2])){if(r<=a)throw new Error("Cannot access property/index "+a+" levels up, current level is "+r);return t[r-a]}if(r<a)throw new Error("Cannot access data "+a+" levels up, current level is "+r);if(o="data"+(r-a||""),!s)return o}for(var n=o,l=s.split("/"),u=0;u<l.length;u++){var c=l[u];c&&(o+=h(R(c)),n+=" && "+o)}return n},unescapeFragment:function(e){return R(decodeURIComponent(e))},unescapeJsonPointer:R,escapeFragment:function(e){return encodeURIComponent(x(e))},escapeJsonPointer:x};var i=n(["string","number","integer","boolean","null"]);function n(e){for(var r={},t=0;t<e.length;t++)r[e[t]]=!0;return r}var a=/^[a-z$_][a-z$_0-9]*$/i,s=/'|\\/g;function h(e){return"number"==typeof e?"["+e+"]":a.test(e)?"."+e:"['"+l(e)+"']"}function l(e){return e.replace(s,"\\$&").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\f/g,"\\f").replace(/\t/g,"\\t")}var u=/else\s*{\s*}/g,c=/if\s*\([^)]+\)\s*\{\s*\}(?!\s*else)/g,d=/if\s*\(([^)]+)\)\s*\{\s*\}\s*else(?!\s*if)/g;var f=/[^v.]errors/g,p=/var errors = 0;|var vErrors = null;|validate.errors = vErrors;/g,m=/var errors = 0;|var vErrors = null;/g,v="return errors === 0;",g="validate.errors = null; return true;",y=/if \(errors === 0\) return data;\s*else throw new ValidationError\(vErrors\);/,P="return data;",E=/[^A-Za-z_$]rootData[^A-Za-z0-9_$]/g,w=/if \(rootData === undefined\) rootData = data;/;function S(e){return"'"+l(e)+"'"}var b=/^\/(?:[^~]|~0|~1)*$/,_=/^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;function F(e,r){return'""'==e?r:(e+" + "+r).replace(/' \+ '/g,"")}function x(e){return e.replace(/~/g,"~0").replace(/\//g,"~1")}function R(e){return e.replace(/~1/g,"/").replace(/~0/g,"~")}},{"./ucs2length":9,"fast-deep-equal":41}],11:[function(e,r,t){"use strict";var l=["multipleOf","maximum","exclusiveMaximum","minimum","exclusiveMinimum","maxLength","minLength","pattern","additionalItems","maxItems","minItems","uniqueItems","maxProperties","minProperties","required","additionalProperties","enum","format","const"];r.exports=function(e,r){for(var t=0;t<r.length;t++){e=JSON.parse(JSON.stringify(e));var a,s=r[t].split("/"),o=e;for(a=1;a<s.length;a++)o=o[s[a]];for(a=0;a<l.length;a++){var i=l[a],n=o[i];n&&(o[i]={anyOf:[n,{$ref:"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#"}]})}}return e}},{}],12:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n;var f="maximum"==r,p=f?"exclusiveMaximum":"exclusiveMinimum",m=e.schema[p],v=e.opts.$data&&m&&m.$data,g=f?"<":">",y=f?">":"<",P=void 0;if(v){var E=e.util.getData(m.$data,i,e.dataPathArr),w="exclusive"+o,S="exclType"+o,b="exclIsNumber"+o,_="' + "+(R="op"+o)+" + '";s+=" var schemaExcl"+o+" = "+E+"; ";var F;P=p;(F=F||[]).push(s+=" var "+w+"; var "+S+" = typeof "+(E="schemaExcl"+o)+"; if ("+S+" != 'boolean' && "+S+" != 'undefined' && "+S+" != 'number') { "),s="",!1!==e.createErrors?(s+=" { keyword: '"+(P||"_exclusiveLimit")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: {} ",!1!==e.opts.messages&&(s+=" , message: '"+p+" should be boolean' "),e.opts.verbose&&(s+=" , schema: validate.schema"+l+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var x=s;s=F.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+x+"]); ":" validate.errors = ["+x+"]; return false; ":" var err = "+x+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+=" } else if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || "),s+=" "+S+" == 'number' ? ( ("+w+" = "+a+" === undefined || "+E+" "+g+"= "+a+") ? "+h+" "+y+"= "+E+" : "+h+" "+y+" "+a+" ) : ( ("+w+" = "+E+" === true) ? "+h+" "+y+"= "+a+" : "+h+" "+y+" "+a+" ) || "+h+" !== "+h+") { var op"+o+" = "+w+" ? '"+g+"' : '"+g+"='; ",void 0===n&&(u=e.errSchemaPath+"/"+(P=p),a=E,d=v)}else{_=g;if((b="number"==typeof m)&&d){var R="'"+_+"'";s+=" if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || "),s+=" ( "+a+" === undefined || "+m+" "+g+"= "+a+" ? "+h+" "+y+"= "+m+" : "+h+" "+y+" "+a+" ) || "+h+" !== "+h+") { "}else{b&&void 0===n?(w=!0,u=e.errSchemaPath+"/"+(P=p),a=m,y+="="):(b&&(a=Math[f?"min":"max"](m,n)),m===(!b||a)?(w=!0,u=e.errSchemaPath+"/"+(P=p),y+="="):(w=!1,_+="="));R="'"+_+"'";s+=" if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || "),s+=" "+h+" "+y+" "+a+" || "+h+" !== "+h+") { "}}P=P||r,(F=F||[]).push(s),s="",!1!==e.createErrors?(s+=" { keyword: '"+(P||"_limit")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { comparison: "+R+", limit: "+a+", exclusive: "+w+" } ",!1!==e.opts.messages&&(s+=" , message: 'should be "+_+" ",s+=d?"' + "+a:a+"'"),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";x=s;return s=F.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+x+"]); ":" validate.errors = ["+x+"]; return false; ":" var err = "+x+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+=" } ",c&&(s+=" else { "),s}},{}],13:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n,s+="if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || ");var f=r,p=p||[];p.push(s+=" "+h+".length "+("maxItems"==r?">":"<")+" "+a+") { "),s="",!1!==e.createErrors?(s+=" { keyword: '"+(f||"_limitItems")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { limit: "+a+" } ",!1!==e.opts.messages&&(s+=" , message: 'should NOT have ",s+="maxItems"==r?"more":"less",s+=" than ",s+=d?"' + "+a+" + '":""+n,s+=" items' "),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var m=s;return s=p.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+="} ",c&&(s+=" else { "),s}},{}],14:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n,s+="if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || "),s+=!1===e.opts.unicode?" "+h+".length ":" ucs2length("+h+") ";var f=r,p=p||[];p.push(s+=" "+("maxLength"==r?">":"<")+" "+a+") { "),s="",!1!==e.createErrors?(s+=" { keyword: '"+(f||"_limitLength")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { limit: "+a+" } ",!1!==e.opts.messages&&(s+=" , message: 'should NOT be ",s+="maxLength"==r?"longer":"shorter",s+=" than ",s+=d?"' + "+a+" + '":""+n,s+=" characters' "),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var m=s;return s=p.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+="} ",c&&(s+=" else { "),s}},{}],15:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n,s+="if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'number') || ");var f=r,p=p||[];p.push(s+=" Object.keys("+h+").length "+("maxProperties"==r?">":"<")+" "+a+") { "),s="",!1!==e.createErrors?(s+=" { keyword: '"+(f||"_limitProperties")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { limit: "+a+" } ",!1!==e.opts.messages&&(s+=" , message: 'should NOT have ",s+="maxProperties"==r?"more":"less",s+=" than ",s+=d?"' + "+a+" + '":""+n,s+=" properties' "),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var m=s;return s=p.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+="} ",c&&(s+=" else { "),s}},{}],16:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.schema[r],o=e.schemaPath+e.util.getProperty(r),i=e.errSchemaPath+"/"+r,n=!e.opts.allErrors,l=e.util.copy(e),u="";l.level++;var c="valid"+l.level,h=l.baseId,d=!0,f=s;if(f)for(var p,m=-1,v=f.length-1;m<v;)p=f[m+=1],e.util.schemaHasRules(p,e.RULES.all)&&(d=!1,l.schema=p,l.schemaPath=o+"["+m+"]",l.errSchemaPath=i+"/"+m,a+="  "+e.validate(l)+" ",l.baseId=h,n&&(a+=" if ("+c+") { ",u+="}"));return n&&(a+=d?" if (true) { ":" "+u.slice(0,-1)+" "),a=e.util.cleanUpCode(a)}},{}],17:[function(e,r,t){"use strict";r.exports=function(r,e,t){var a=" ",s=r.level,o=r.dataLevel,i=r.schema[e],n=r.schemaPath+r.util.getProperty(e),l=r.errSchemaPath+"/"+e,u=!r.opts.allErrors,c="data"+(o||""),h="valid"+s,d="errs__"+s,f=r.util.copy(r),p="";f.level++;var m="valid"+f.level;if(i.every(function(e){return r.util.schemaHasRules(e,r.RULES.all)})){var v=f.baseId;a+=" var "+d+" = errors; var "+h+" = false;  ";var g=r.compositeRule;r.compositeRule=f.compositeRule=!0;var y=i;if(y)for(var P,E=-1,w=y.length-1;E<w;)P=y[E+=1],f.schema=P,f.schemaPath=n+"["+E+"]",f.errSchemaPath=l+"/"+E,a+="  "+r.validate(f)+" ",f.baseId=v,a+=" "+h+" = "+h+" || "+m+"; if (!"+h+") { ",p+="}";r.compositeRule=f.compositeRule=g,a+=" "+p+" if (!"+h+") {   var err =   ",!1!==r.createErrors?(a+=" { keyword: 'anyOf' , dataPath: (dataPath || '') + "+r.errorPath+" , schemaPath: "+r.util.toQuotedString(l)+" , params: {} ",!1!==r.opts.messages&&(a+=" , message: 'should match some schema in anyOf' "),r.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+r.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",!r.compositeRule&&u&&(a+=r.async?" throw new ValidationError(vErrors); ":" validate.errors = vErrors; return false; "),a+=" } else {  errors = "+d+"; if (vErrors !== null) { if ("+d+") vErrors.length = "+d+"; else vErrors = null; } ",r.opts.allErrors&&(a+=" } "),a=r.util.cleanUpCode(a)}else u&&(a+=" if (true) { ");return a}},{}],18:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.errSchemaPath+"/"+r,o=e.util.toQuotedString(e.schema[r]);return!0===e.opts.$comment?a+=" console.log("+o+");":"function"==typeof e.opts.$comment&&(a+=" self._opts.$comment("+o+", "+e.util.toQuotedString(s)+", validate.root.schema);"),a}},{}],19:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d=e.opts.$data&&i&&i.$data;d&&(a+=" var schema"+s+" = "+e.util.getData(i.$data,o,e.dataPathArr)+"; "),d||(a+=" var schema"+s+" = validate.schema"+n+";");var f=f||[];f.push(a+="var "+h+" = equal("+c+", schema"+s+"); if (!"+h+") {   "),a="",!1!==e.createErrors?(a+=" { keyword: 'const' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { allowedValue: schema"+s+" } ",!1!==e.opts.messages&&(a+=" , message: 'should be equal to constant' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var p=a;return a=f.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+p+"]); ":" validate.errors = ["+p+"]; return false; ":" var err = "+p+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" }",u&&(a+=" else { "),a}},{}],20:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d="errs__"+s,f=e.util.copy(e);f.level++;var p="valid"+f.level,m="i"+s,v=f.dataLevel=e.dataLevel+1,g="data"+v,y=e.baseId,P=e.util.schemaHasRules(i,e.RULES.all);if(a+="var "+d+" = errors;var "+h+";",P){var E=e.compositeRule;e.compositeRule=f.compositeRule=!0,f.schema=i,f.schemaPath=n,f.errSchemaPath=l,a+=" var "+p+" = false; for (var "+m+" = 0; "+m+" < "+c+".length; "+m+"++) { ",f.errorPath=e.util.getPathExpr(e.errorPath,m,e.opts.jsonPointers,!0);var w=c+"["+m+"]";f.dataPathArr[v]=m;var S=e.validate(f);f.baseId=y,e.util.varOccurences(S,g)<2?a+=" "+e.util.varReplace(S,g,w)+" ":a+=" var "+g+" = "+w+"; "+S+" ",a+=" if ("+p+") break; }  ",e.compositeRule=f.compositeRule=E,a+="  if (!"+p+") {"}else a+=" if ("+c+".length == 0) {";var b=b||[];b.push(a),a="",!1!==e.createErrors?(a+=" { keyword: 'contains' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: {} ",!1!==e.opts.messages&&(a+=" , message: 'should contain a valid item' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var _=a;return a=b.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+_+"]); ":" validate.errors = ["+_+"]; return false; ":" var err = "+_+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } else { ",P&&(a+="  errors = "+d+"; if (vErrors !== null) { if ("+d+") vErrors.length = "+d+"; else vErrors = null; } "),e.opts.allErrors&&(a+=" } "),a=e.util.cleanUpCode(a)}},{}],21:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s,o=" ",i=e.level,n=e.dataLevel,l=e.schema[r],u=e.schemaPath+e.util.getProperty(r),c=e.errSchemaPath+"/"+r,h=!e.opts.allErrors,d="data"+(n||""),f="valid"+i,p="errs__"+i,m=e.opts.$data&&l&&l.$data;m?(o+=" var schema"+i+" = "+e.util.getData(l.$data,n,e.dataPathArr)+"; ",s="schema"+i):s=l;var v,g,y,P,E,w=this,S="definition"+i,b=w.definition,_="";if(m&&b.$data){var F=b.validateSchema;o+=" var "+S+" = RULES.custom['"+r+"'].definition; var "+(E="keywordValidate"+i)+" = "+S+".validate;"}else{if(!(P=e.useCustomRule(w,l,e.schema,e)))return;s="validate.schema"+u,E=P.code,v=b.compile,g=b.inline,y=b.macro}var x=E+".errors",R="i"+i,$="ruleErr"+i,D=b.async;if(D&&!e.async)throw new Error("async keyword in sync schema");if(g||y||(o+=x+" = null;"),o+="var "+p+" = errors;var "+f+";",m&&b.$data&&(_+="}",o+=" if ("+s+" === undefined) { "+f+" = true; } else { ",F&&(_+="}",o+=" "+f+" = "+S+".validateSchema("+s+"); if ("+f+") { ")),g)o+=b.statements?" "+P.validate+" ":" "+f+" = "+P.validate+"; ";else if(y){var j=e.util.copy(e);_="";j.level++;var I="valid"+j.level;j.schema=P.validate,j.schemaPath="";var O=e.compositeRule;e.compositeRule=j.compositeRule=!0;var A=e.validate(j).replace(/validate\.schema/g,E);e.compositeRule=j.compositeRule=O,o+=" "+A}else{(z=z||[]).push(o),o="",o+="  "+E+".call( ",o+=e.opts.passContext?"this":"self",o+=v||!1===b.schema?" , "+d+" ":" , "+s+" , "+d+" , validate.schema"+e.schemaPath+" ",o+=" , (dataPath || '')",'""'!=e.errorPath&&(o+=" + "+e.errorPath);var C=n?"data"+(n-1||""):"parentData",k=n?e.dataPathArr[n]:"parentDataProperty",L=o+=" , "+C+" , "+k+" , rootData )  ";o=z.pop(),!1===b.errors?(o+=" "+f+" = ",D&&(o+="await "),o+=L+"; "):o+=D?" var "+(x="customErrors"+i)+" = null; try { "+f+" = await "+L+"; } catch (e) { "+f+" = false; if (e instanceof ValidationError) "+x+" = e.errors; else throw e; } ":" "+x+" = null; "+f+" = "+L+"; "}if(b.modifying&&(o+=" if ("+C+") "+d+" = "+C+"["+k+"];"),o+=""+_,b.valid)h&&(o+=" if (true) { ");else{var z;o+=" if ( ",void 0===b.valid?(o+=" !",o+=y?""+I:""+f):o+=" "+!b.valid+" ",a=w.keyword,(z=z||[]).push(o+=") { "),(z=z||[]).push(o=""),o="",!1!==e.createErrors?(o+=" { keyword: '"+(a||"custom")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(c)+" , params: { keyword: '"+w.keyword+"' } ",!1!==e.opts.messages&&(o+=" , message: 'should pass \""+w.keyword+"\" keyword validation' "),e.opts.verbose&&(o+=" , schema: validate.schema"+u+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+d+" "),o+=" } "):o+=" {} ";var T=o;o=z.pop();var N=o+=!e.compositeRule&&h?e.async?" throw new ValidationError(["+T+"]); ":" validate.errors = ["+T+"]; return false; ":" var err = "+T+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ";o=z.pop(),g?b.errors?"full"!=b.errors&&(o+="  for (var "+R+"="+p+"; "+R+"<errors; "+R+"++) { var "+$+" = vErrors["+R+"]; if ("+$+".dataPath === undefined) "+$+".dataPath = (dataPath || '') + "+e.errorPath+"; if ("+$+".schemaPath === undefined) { "+$+'.schemaPath = "'+c+'"; } ',e.opts.verbose&&(o+=" "+$+".schema = "+s+"; "+$+".data = "+d+"; "),o+=" } "):!1===b.errors?o+=" "+N+" ":(o+=" if ("+p+" == errors) { "+N+" } else {  for (var "+R+"="+p+"; "+R+"<errors; "+R+"++) { var "+$+" = vErrors["+R+"]; if ("+$+".dataPath === undefined) "+$+".dataPath = (dataPath || '') + "+e.errorPath+"; if ("+$+".schemaPath === undefined) { "+$+'.schemaPath = "'+c+'"; } ',e.opts.verbose&&(o+=" "+$+".schema = "+s+"; "+$+".data = "+d+"; "),o+=" } } "):y?(o+="   var err =   ",!1!==e.createErrors?(o+=" { keyword: '"+(a||"custom")+"' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(c)+" , params: { keyword: '"+w.keyword+"' } ",!1!==e.opts.messages&&(o+=" , message: 'should pass \""+w.keyword+"\" keyword validation' "),e.opts.verbose&&(o+=" , schema: validate.schema"+u+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+d+" "),o+=" } "):o+=" {} ",o+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",!e.compositeRule&&h&&(o+=e.async?" throw new ValidationError(vErrors); ":" validate.errors = vErrors; return false; ")):!1===b.errors?o+=" "+N+" ":(o+=" if (Array.isArray("+x+")) { if (vErrors === null) vErrors = "+x+"; else vErrors = vErrors.concat("+x+"); errors = vErrors.length;  for (var "+R+"="+p+"; "+R+"<errors; "+R+"++) { var "+$+" = vErrors["+R+"]; if ("+$+".dataPath === undefined) "+$+".dataPath = (dataPath || '') + "+e.errorPath+";  "+$+'.schemaPath = "'+c+'";  ',e.opts.verbose&&(o+=" "+$+".schema = "+s+"; "+$+".data = "+d+"; "),o+=" } } else { "+N+" } "),o+=" } ",h&&(o+=" else { ")}return o}},{}],22:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="errs__"+s,d=e.util.copy(e),f="";d.level++;var p="valid"+d.level,m={},v={},g=e.opts.ownProperties;for(w in i){var y=i[w],P=Array.isArray(y)?v:m;P[w]=y}a+="var "+h+" = errors;";var E=e.errorPath;for(var w in a+="var missing"+s+";",v)if((P=v[w]).length){if(a+=" if ( "+c+e.util.getProperty(w)+" !== undefined ",g&&(a+=" && Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(w)+"') "),u){a+=" && ( ";var S=P;if(S)for(var b=-1,_=S.length-1;b<_;){j=S[b+=1],b&&(a+=" || "),a+=" ( ( "+(C=c+(A=e.util.getProperty(j)))+" === undefined ",g&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(j)+"') "),a+=") && (missing"+s+" = "+e.util.toQuotedString(e.opts.jsonPointers?j:A)+") ) "}a+=")) {  ";var F="missing"+s,x="' + "+F+" + '";e.opts._errorDataPathProperty&&(e.errorPath=e.opts.jsonPointers?e.util.getPathExpr(E,F,!0):E+" + "+F);var R=R||[];R.push(a),a="",!1!==e.createErrors?(a+=" { keyword: 'dependencies' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { property: '"+e.util.escapeQuotes(w)+"', missingProperty: '"+x+"', depsCount: "+P.length+", deps: '"+e.util.escapeQuotes(1==P.length?P[0]:P.join(", "))+"' } ",!1!==e.opts.messages&&(a+=" , message: 'should have ",a+=1==P.length?"property "+e.util.escapeQuotes(P[0]):"properties "+e.util.escapeQuotes(P.join(", ")),a+=" when property "+e.util.escapeQuotes(w)+" is present' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var $=a;a=R.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+$+"]); ":" validate.errors = ["+$+"]; return false; ":" var err = "+$+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; "}else{a+=" ) { ";var D=P;if(D)for(var j,I=-1,O=D.length-1;I<O;){j=D[I+=1];var A=e.util.getProperty(j),C=(x=e.util.escapeQuotes(j),c+A);e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPath(E,j,e.opts.jsonPointers)),a+=" if ( "+C+" === undefined ",g&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(j)+"') "),a+=") {  var err =   ",!1!==e.createErrors?(a+=" { keyword: 'dependencies' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { property: '"+e.util.escapeQuotes(w)+"', missingProperty: '"+x+"', depsCount: "+P.length+", deps: '"+e.util.escapeQuotes(1==P.length?P[0]:P.join(", "))+"' } ",!1!==e.opts.messages&&(a+=" , message: 'should have ",a+=1==P.length?"property "+e.util.escapeQuotes(P[0]):"properties "+e.util.escapeQuotes(P.join(", ")),a+=" when property "+e.util.escapeQuotes(w)+" is present' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } "}}a+=" }   ",u&&(f+="}",a+=" else { ")}e.errorPath=E;var k=d.baseId;for(var w in m){e.util.schemaHasRules(y=m[w],e.RULES.all)&&(a+=" "+p+" = true; if ( "+c+e.util.getProperty(w)+" !== undefined ",g&&(a+=" && Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(w)+"') "),a+=") { ",d.schema=y,d.schemaPath=n+e.util.getProperty(w),d.errSchemaPath=l+"/"+e.util.escapeFragment(w),a+="  "+e.validate(d)+" ",d.baseId=k,a+=" }  ",u&&(a+=" if ("+p+") { ",f+="}"))}return u&&(a+="   "+f+" if ("+h+" == errors) {"),a=e.util.cleanUpCode(a)}},{}],23:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d=e.opts.$data&&i&&i.$data;d&&(a+=" var schema"+s+" = "+e.util.getData(i.$data,o,e.dataPathArr)+"; ");var f="i"+s,p="schema"+s;d||(a+=" var "+p+" = validate.schema"+n+";"),a+="var "+h+";",d&&(a+=" if (schema"+s+" === undefined) "+h+" = true; else if (!Array.isArray(schema"+s+")) "+h+" = false; else {"),a+=h+" = false;for (var "+f+"=0; "+f+"<"+p+".length; "+f+"++) if (equal("+c+", "+p+"["+f+"])) { "+h+" = true; break; }",d&&(a+="  }  ");var m=m||[];m.push(a+=" if (!"+h+") {   "),a="",!1!==e.createErrors?(a+=" { keyword: 'enum' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { allowedValues: schema"+s+" } ",!1!==e.opts.messages&&(a+=" , message: 'should be equal to one of the allowed values' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var v=a;return a=m.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+v+"]); ":" validate.errors = ["+v+"]; return false; ":" var err = "+v+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" }",u&&(a+=" else { "),a}},{}],24:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||"");if(!1===e.opts.format)return u&&(a+=" if (true) { "),a;var h,d=e.opts.$data&&i&&i.$data;d?(a+=" var schema"+s+" = "+e.util.getData(i.$data,o,e.dataPathArr)+"; ",h="schema"+s):h=i;var f=e.opts.unknownFormats,p=Array.isArray(f);if(d){a+=" var "+(m="format"+s)+" = formats["+h+"]; var "+(v="isObject"+s)+" = typeof "+m+" == 'object' && !("+m+" instanceof RegExp) && "+m+".validate; var "+(g="formatType"+s)+" = "+v+" && "+m+".type || 'string'; if ("+v+") { ",e.async&&(a+=" var async"+s+" = "+m+".async; "),a+=" "+m+" = "+m+".validate; } if (  ",d&&(a+=" ("+h+" !== undefined && typeof "+h+" != 'string') || "),a+=" (","ignore"!=f&&(a+=" ("+h+" && !"+m+" ",p&&(a+=" && self._opts.unknownFormats.indexOf("+h+") == -1 "),a+=") || "),a+=" ("+m+" && "+g+" == '"+t+"' && !(typeof "+m+" == 'function' ? ",a+=e.async?" (async"+s+" ? await "+m+"("+c+") : "+m+"("+c+")) ":" "+m+"("+c+") ",a+=" : "+m+".test("+c+"))))) {"}else{var m;if(!(m=e.formats[i])){if("ignore"==f)return e.logger.warn('unknown format "'+i+'" ignored in schema at path "'+e.errSchemaPath+'"'),u&&(a+=" if (true) { "),a;if(p&&0<=f.indexOf(i))return u&&(a+=" if (true) { "),a;throw new Error('unknown format "'+i+'" is used in schema at path "'+e.errSchemaPath+'"')}var v,g=(v="object"==typeof m&&!(m instanceof RegExp)&&m.validate)&&m.type||"string";if(v){var y=!0===m.async;m=m.validate}if(g!=t)return u&&(a+=" if (true) { "),a;if(y){if(!e.async)throw new Error("async format in sync schema");a+=" if (!(await "+(P="formats"+e.util.getProperty(i)+".validate")+"("+c+"))) { "}else{a+=" if (! ";var P="formats"+e.util.getProperty(i);v&&(P+=".validate"),a+="function"==typeof m?" "+P+"("+c+") ":" "+P+".test("+c+") ",a+=") { "}}var E=E||[];E.push(a),a="",!1!==e.createErrors?(a+=" { keyword: 'format' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { format:  ",a+=d?""+h:""+e.util.toQuotedString(i),a+="  } ",!1!==e.opts.messages&&(a+=" , message: 'should match format \"",a+=d?"' + "+h+" + '":""+e.util.escapeQuotes(i),a+="\"' "),e.opts.verbose&&(a+=" , schema:  ",a+=d?"validate.schema"+n:""+e.util.toQuotedString(i),a+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var w=a;return a=E.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+w+"]); ":" validate.errors = ["+w+"]; return false; ":" var err = "+w+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } ",u&&(a+=" else { "),a}},{}],25:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d="errs__"+s,f=e.util.copy(e);f.level++;var p="valid"+f.level,m=e.schema.then,v=e.schema.else,g=void 0!==m&&e.util.schemaHasRules(m,e.RULES.all),y=void 0!==v&&e.util.schemaHasRules(v,e.RULES.all),P=f.baseId;if(g||y){var E;f.createErrors=!1,f.schema=i,f.schemaPath=n,f.errSchemaPath=l,a+=" var "+d+" = errors; var "+h+" = true;  ";var w=e.compositeRule;e.compositeRule=f.compositeRule=!0,a+="  "+e.validate(f)+" ",f.baseId=P,f.createErrors=!0,a+="  errors = "+d+"; if (vErrors !== null) { if ("+d+") vErrors.length = "+d+"; else vErrors = null; }  ",e.compositeRule=f.compositeRule=w,g?(a+=" if ("+p+") {  ",f.schema=e.schema.then,f.schemaPath=e.schemaPath+".then",f.errSchemaPath=e.errSchemaPath+"/then",a+="  "+e.validate(f)+" ",f.baseId=P,a+=" "+h+" = "+p+"; ",g&&y?a+=" var "+(E="ifClause"+s)+" = 'then'; ":E="'then'",a+=" } ",y&&(a+=" else { ")):a+=" if (!"+p+") { ",y&&(f.schema=e.schema.else,f.schemaPath=e.schemaPath+".else",f.errSchemaPath=e.errSchemaPath+"/else",a+="  "+e.validate(f)+" ",f.baseId=P,a+=" "+h+" = "+p+"; ",g&&y?a+=" var "+(E="ifClause"+s)+" = 'else'; ":E="'else'",a+=" } "),a+=" if (!"+h+") {   var err =   ",!1!==e.createErrors?(a+=" { keyword: 'if' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { failingKeyword: "+E+" } ",!1!==e.opts.messages&&(a+=" , message: 'should match \"' + "+E+" + '\" schema' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",!e.compositeRule&&u&&(a+=e.async?" throw new ValidationError(vErrors); ":" validate.errors = vErrors; return false; "),a+=" }   ",u&&(a+=" else { "),a=e.util.cleanUpCode(a)}else u&&(a+=" if (true) { ");return a}},{}],26:[function(e,r,t){"use strict";r.exports={$ref:e("./ref"),allOf:e("./allOf"),anyOf:e("./anyOf"),$comment:e("./comment"),const:e("./const"),contains:e("./contains"),dependencies:e("./dependencies"),enum:e("./enum"),format:e("./format"),if:e("./if"),items:e("./items"),maximum:e("./_limit"),minimum:e("./_limit"),maxItems:e("./_limitItems"),minItems:e("./_limitItems"),maxLength:e("./_limitLength"),minLength:e("./_limitLength"),maxProperties:e("./_limitProperties"),minProperties:e("./_limitProperties"),multipleOf:e("./multipleOf"),not:e("./not"),oneOf:e("./oneOf"),pattern:e("./pattern"),properties:e("./properties"),propertyNames:e("./propertyNames"),required:e("./required"),uniqueItems:e("./uniqueItems"),validate:e("./validate")}},{"./_limit":12,"./_limitItems":13,"./_limitLength":14,"./_limitProperties":15,"./allOf":16,"./anyOf":17,"./comment":18,"./const":19,"./contains":20,"./dependencies":22,"./enum":23,"./format":24,"./if":25,"./items":27,"./multipleOf":28,"./not":29,"./oneOf":30,"./pattern":31,"./properties":32,"./propertyNames":33,"./ref":34,"./required":35,"./uniqueItems":36,"./validate":37}],27:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d="errs__"+s,f=e.util.copy(e),p="";f.level++;var m="valid"+f.level,v="i"+s,g=f.dataLevel=e.dataLevel+1,y="data"+g,P=e.baseId;if(a+="var "+d+" = errors;var "+h+";",Array.isArray(i)){var E=e.schema.additionalItems;if(!1===E){a+=" "+h+" = "+c+".length <= "+i.length+"; ";var w=l;l=e.errSchemaPath+"/additionalItems";var S=S||[];S.push(a+="  if (!"+h+") {   "),a="",!1!==e.createErrors?(a+=" { keyword: 'additionalItems' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { limit: "+i.length+" } ",!1!==e.opts.messages&&(a+=" , message: 'should NOT have more than "+i.length+" items' "),e.opts.verbose&&(a+=" , schema: false , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var b=a;a=S.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+b+"]); ":" validate.errors = ["+b+"]; return false; ":" var err = "+b+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } ",l=w,u&&(p+="}",a+=" else { ")}var _=i;if(_)for(var F,x=-1,R=_.length-1;x<R;)if(F=_[x+=1],e.util.schemaHasRules(F,e.RULES.all)){a+=" "+m+" = true; if ("+c+".length > "+x+") { ";var $=c+"["+x+"]";f.schema=F,f.schemaPath=n+"["+x+"]",f.errSchemaPath=l+"/"+x,f.errorPath=e.util.getPathExpr(e.errorPath,x,e.opts.jsonPointers,!0),f.dataPathArr[g]=x;var D=e.validate(f);f.baseId=P,e.util.varOccurences(D,y)<2?a+=" "+e.util.varReplace(D,y,$)+" ":a+=" var "+y+" = "+$+"; "+D+" ",a+=" }  ",u&&(a+=" if ("+m+") { ",p+="}")}if("object"==typeof E&&e.util.schemaHasRules(E,e.RULES.all)){f.schema=E,f.schemaPath=e.schemaPath+".additionalItems",f.errSchemaPath=e.errSchemaPath+"/additionalItems",a+=" "+m+" = true; if ("+c+".length > "+i.length+") {  for (var "+v+" = "+i.length+"; "+v+" < "+c+".length; "+v+"++) { ",f.errorPath=e.util.getPathExpr(e.errorPath,v,e.opts.jsonPointers,!0);$=c+"["+v+"]";f.dataPathArr[g]=v;D=e.validate(f);f.baseId=P,e.util.varOccurences(D,y)<2?a+=" "+e.util.varReplace(D,y,$)+" ":a+=" var "+y+" = "+$+"; "+D+" ",u&&(a+=" if (!"+m+") break; "),a+=" } }  ",u&&(a+=" if ("+m+") { ",p+="}")}}else if(e.util.schemaHasRules(i,e.RULES.all)){f.schema=i,f.schemaPath=n,f.errSchemaPath=l,a+="  for (var "+v+" = 0; "+v+" < "+c+".length; "+v+"++) { ",f.errorPath=e.util.getPathExpr(e.errorPath,v,e.opts.jsonPointers,!0);$=c+"["+v+"]";f.dataPathArr[g]=v;D=e.validate(f);f.baseId=P,e.util.varOccurences(D,y)<2?a+=" "+e.util.varReplace(D,y,$)+" ":a+=" var "+y+" = "+$+"; "+D+" ",u&&(a+=" if (!"+m+") break; "),a+=" }"}return u&&(a+=" "+p+" if ("+d+" == errors) {"),a=e.util.cleanUpCode(a)}},{}],28:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n,s+="var division"+o+";if (",d&&(s+=" "+a+" !== undefined && ( typeof "+a+" != 'number' || "),s+=" (division"+o+" = "+h+" / "+a+", ",s+=e.opts.multipleOfPrecision?" Math.abs(Math.round(division"+o+") - division"+o+") > 1e-"+e.opts.multipleOfPrecision+" ":" division"+o+" !== parseInt(division"+o+") ",s+=" ) ",d&&(s+="  )  ");var f=f||[];f.push(s+=" ) {   "),s="",!1!==e.createErrors?(s+=" { keyword: 'multipleOf' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { multipleOf: "+a+" } ",!1!==e.opts.messages&&(s+=" , message: 'should be multiple of ",s+=d?"' + "+a:a+"'"),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var p=s;return s=f.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+p+"]); ":" validate.errors = ["+p+"]; return false; ":" var err = "+p+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+="} ",c&&(s+=" else { "),s}},{}],29:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="errs__"+s,d=e.util.copy(e);d.level++;var f="valid"+d.level;if(e.util.schemaHasRules(i,e.RULES.all)){d.schema=i,d.schemaPath=n,d.errSchemaPath=l,a+=" var "+h+" = errors;  ";var p,m=e.compositeRule;e.compositeRule=d.compositeRule=!0,d.createErrors=!1,d.opts.allErrors&&(p=d.opts.allErrors,d.opts.allErrors=!1),a+=" "+e.validate(d)+" ",d.createErrors=!0,p&&(d.opts.allErrors=p),e.compositeRule=d.compositeRule=m;var v=v||[];v.push(a+=" if ("+f+") {   "),a="",!1!==e.createErrors?(a+=" { keyword: 'not' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: {} ",!1!==e.opts.messages&&(a+=" , message: 'should NOT be valid' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var g=a;a=v.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+g+"]); ":" validate.errors = ["+g+"]; return false; ":" var err = "+g+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } else {  errors = "+h+"; if (vErrors !== null) { if ("+h+") vErrors.length = "+h+"; else vErrors = null; } ",e.opts.allErrors&&(a+=" } ")}else a+="  var err =   ",!1!==e.createErrors?(a+=" { keyword: 'not' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: {} ",!1!==e.opts.messages&&(a+=" , message: 'should NOT be valid' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",u&&(a+=" if (false) { ");return a}},{}],30:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d="errs__"+s,f=e.util.copy(e),p="";f.level++;var m="valid"+f.level,v=f.baseId,g="prevValid"+s,y="passingSchemas"+s;a+="var "+d+" = errors , "+g+" = false , "+h+" = false , "+y+" = null; ";var P=e.compositeRule;e.compositeRule=f.compositeRule=!0;var E=i;if(E)for(var w,S=-1,b=E.length-1;S<b;)w=E[S+=1],e.util.schemaHasRules(w,e.RULES.all)?(f.schema=w,f.schemaPath=n+"["+S+"]",f.errSchemaPath=l+"/"+S,a+="  "+e.validate(f)+" ",f.baseId=v):a+=" var "+m+" = true; ",S&&(a+=" if ("+m+" && "+g+") { "+h+" = false; "+y+" = ["+y+", "+S+"]; } else { ",p+="}"),a+=" if ("+m+") { "+h+" = "+g+" = true; "+y+" = "+S+"; }";return e.compositeRule=f.compositeRule=P,a+=p+"if (!"+h+") {   var err =   ",!1!==e.createErrors?(a+=" { keyword: 'oneOf' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { passingSchemas: "+y+" } ",!1!==e.opts.messages&&(a+=" , message: 'should match exactly one schema in oneOf' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",!e.compositeRule&&u&&(a+=e.async?" throw new ValidationError(vErrors); ":" validate.errors = vErrors; return false; "),a+="} else {  errors = "+d+"; if (vErrors !== null) { if ("+d+") vErrors.length = "+d+"; else vErrors = null; }",e.opts.allErrors&&(a+=" } "),a}},{}],31:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d=e.opts.$data&&n&&n.$data;d?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n;var f=d?"(new RegExp("+a+"))":e.usePattern(n);s+="if ( ",d&&(s+=" ("+a+" !== undefined && typeof "+a+" != 'string') || ");var p=p||[];p.push(s+=" !"+f+".test("+h+") ) {   "),s="",!1!==e.createErrors?(s+=" { keyword: 'pattern' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { pattern:  ",s+=d?""+a:""+e.util.toQuotedString(n),s+="  } ",!1!==e.opts.messages&&(s+=" , message: 'should match pattern \"",s+=d?"' + "+a+" + '":""+e.util.escapeQuotes(n),s+="\"' "),e.opts.verbose&&(s+=" , schema:  ",s+=d?"validate.schema"+l:""+e.util.toQuotedString(n),s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var m=s;return s=p.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+="} ",c&&(s+=" else { "),s}},{}],32:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="errs__"+s,d=e.util.copy(e),f="";d.level++;var p="valid"+d.level,m="key"+s,v="idx"+s,g=d.dataLevel=e.dataLevel+1,y="data"+g,P="dataProperties"+s,E=Object.keys(i||{}),w=e.schema.patternProperties||{},S=Object.keys(w),b=e.schema.additionalProperties,_=E.length||S.length,F=!1===b,x="object"==typeof b&&Object.keys(b).length,R=e.opts.removeAdditional,$=F||x||R,D=e.opts.ownProperties,j=e.baseId,I=e.schema.required;if(I&&(!e.opts.$data||!I.$data)&&I.length<e.opts.loopRequired)var O=e.util.toHash(I);if(a+="var "+h+" = errors;var "+p+" = true;",D&&(a+=" var "+P+" = undefined;"),$){if(a+=D?" "+P+" = "+P+" || Object.keys("+c+"); for (var "+v+"=0; "+v+"<"+P+".length; "+v+"++) { var "+m+" = "+P+"["+v+"]; ":" for (var "+m+" in "+c+") { ",_){if(a+=" var isAdditional"+s+" = !(false ",E.length)if(8<E.length)a+=" || validate.schema"+n+".hasOwnProperty("+m+") ";else{var A=E;if(A)for(var C=-1,k=A.length-1;C<k;)J=A[C+=1],a+=" || "+m+" == "+e.util.toQuotedString(J)+" "}if(S.length){var L=S;if(L)for(var z=-1,T=L.length-1;z<T;)ae=L[z+=1],a+=" || "+e.usePattern(ae)+".test("+m+") "}a+=" ); if (isAdditional"+s+") { "}if("all"==R)a+=" delete "+c+"["+m+"]; ";else{var N=e.errorPath,q="' + "+m+" + '";if(e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPathExpr(e.errorPath,m,e.opts.jsonPointers)),F)if(R)a+=" delete "+c+"["+m+"]; ";else{var U=l;l=e.errSchemaPath+"/additionalProperties",(ee=ee||[]).push(a+=" "+p+" = false; "),a="",!1!==e.createErrors?(a+=" { keyword: 'additionalProperties' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { additionalProperty: '"+q+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is an invalid additional property":"should NOT have additional properties",a+="' "),e.opts.verbose&&(a+=" , schema: false , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var Q=a;a=ee.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+Q+"]); ":" validate.errors = ["+Q+"]; return false; ":" var err = "+Q+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",l=U,u&&(a+=" break; ")}else if(x)if("failing"==R){a+=" var "+h+" = errors;  ";var V=e.compositeRule;e.compositeRule=d.compositeRule=!0,d.schema=b,d.schemaPath=e.schemaPath+".additionalProperties",d.errSchemaPath=e.errSchemaPath+"/additionalProperties",d.errorPath=e.opts._errorDataPathProperty?e.errorPath:e.util.getPathExpr(e.errorPath,m,e.opts.jsonPointers);var H=c+"["+m+"]";d.dataPathArr[g]=m;var M=e.validate(d);d.baseId=j,e.util.varOccurences(M,y)<2?a+=" "+e.util.varReplace(M,y,H)+" ":a+=" var "+y+" = "+H+"; "+M+" ",a+=" if (!"+p+") { errors = "+h+"; if (validate.errors !== null) { if (errors) validate.errors.length = errors; else validate.errors = null; } delete "+c+"["+m+"]; }  ",e.compositeRule=d.compositeRule=V}else{d.schema=b,d.schemaPath=e.schemaPath+".additionalProperties",d.errSchemaPath=e.errSchemaPath+"/additionalProperties",d.errorPath=e.opts._errorDataPathProperty?e.errorPath:e.util.getPathExpr(e.errorPath,m,e.opts.jsonPointers);H=c+"["+m+"]";d.dataPathArr[g]=m;M=e.validate(d);d.baseId=j,e.util.varOccurences(M,y)<2?a+=" "+e.util.varReplace(M,y,H)+" ":a+=" var "+y+" = "+H+"; "+M+" ",u&&(a+=" if (!"+p+") break; ")}e.errorPath=N}_&&(a+=" } "),a+=" }  ",u&&(a+=" if ("+p+") { ",f+="}")}var B=e.opts.useDefaults&&!e.compositeRule;if(E.length){var K=E;if(K)for(var J,Z=-1,G=K.length-1;Z<G;){if(J=K[Z+=1],e.util.schemaHasRules(ie=i[J],e.RULES.all)){var Y=e.util.getProperty(J),W=(H=c+Y,B&&void 0!==ie.default);d.schema=ie,d.schemaPath=n+Y,d.errSchemaPath=l+"/"+e.util.escapeFragment(J),d.errorPath=e.util.getPath(e.errorPath,J,e.opts.jsonPointers),d.dataPathArr[g]=e.util.toQuotedString(J);M=e.validate(d);if(d.baseId=j,e.util.varOccurences(M,y)<2){M=e.util.varReplace(M,y,H);var X=H}else{X=y;a+=" var "+y+" = "+H+"; "}if(W)a+=" "+M+" ";else{if(O&&O[J]){a+=" if ( "+X+" === undefined ",D&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(J)+"') "),a+=") { "+p+" = false; ";N=e.errorPath,U=l;var ee,re=e.util.escapeQuotes(J);e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPath(N,J,e.opts.jsonPointers)),l=e.errSchemaPath+"/required",(ee=ee||[]).push(a),a="",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+re+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+re+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";Q=a;a=ee.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+Q+"]); ":" validate.errors = ["+Q+"]; return false; ":" var err = "+Q+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",l=U,e.errorPath=N,a+=" } else { "}else u?(a+=" if ( "+X+" === undefined ",D&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(J)+"') "),a+=") { "+p+" = true; } else { "):(a+=" if ("+X+" !== undefined ",D&&(a+=" &&   Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(J)+"') "),a+=" ) { ");a+=" "+M+" } "}}u&&(a+=" if ("+p+") { ",f+="}")}}if(S.length){var te=S;if(te)for(var ae,se=-1,oe=te.length-1;se<oe;){var ie;if(ae=te[se+=1],e.util.schemaHasRules(ie=w[ae],e.RULES.all)){d.schema=ie,d.schemaPath=e.schemaPath+".patternProperties"+e.util.getProperty(ae),d.errSchemaPath=e.errSchemaPath+"/patternProperties/"+e.util.escapeFragment(ae),a+=D?" "+P+" = "+P+" || Object.keys("+c+"); for (var "+v+"=0; "+v+"<"+P+".length; "+v+"++) { var "+m+" = "+P+"["+v+"]; ":" for (var "+m+" in "+c+") { ",a+=" if ("+e.usePattern(ae)+".test("+m+")) { ",d.errorPath=e.util.getPathExpr(e.errorPath,m,e.opts.jsonPointers);H=c+"["+m+"]";d.dataPathArr[g]=m;M=e.validate(d);d.baseId=j,e.util.varOccurences(M,y)<2?a+=" "+e.util.varReplace(M,y,H)+" ":a+=" var "+y+" = "+H+"; "+M+" ",u&&(a+=" if (!"+p+") break; "),a+=" } ",u&&(a+=" else "+p+" = true; "),a+=" }  ",u&&(a+=" if ("+p+") { ",f+="}")}}}return u&&(a+=" "+f+" if ("+h+" == errors) {"),a=e.util.cleanUpCode(a)}},{}],33:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="errs__"+s,d=e.util.copy(e);d.level++;var f="valid"+d.level;if(e.util.schemaHasRules(i,e.RULES.all)){d.schema=i,d.schemaPath=n,d.errSchemaPath=l;var p="key"+s,m="idx"+s,v="i"+s,g="' + "+p+" + '",y="data"+(d.dataLevel=e.dataLevel+1),P="dataProperties"+s,E=e.opts.ownProperties,w=e.baseId;a+=" var "+h+" = errors; ",E&&(a+=" var "+P+" = undefined; "),a+=E?" "+P+" = "+P+" || Object.keys("+c+"); for (var "+m+"=0; "+m+"<"+P+".length; "+m+"++) { var "+p+" = "+P+"["+m+"]; ":" for (var "+p+" in "+c+") { ",a+=" var startErrs"+s+" = errors; ";var S=p,b=e.compositeRule;e.compositeRule=d.compositeRule=!0;var _=e.validate(d);d.baseId=w,e.util.varOccurences(_,y)<2?a+=" "+e.util.varReplace(_,y,S)+" ":a+=" var "+y+" = "+S+"; "+_+" ",e.compositeRule=d.compositeRule=b,a+=" if (!"+f+") { for (var "+v+"=startErrs"+s+"; "+v+"<errors; "+v+"++) { vErrors["+v+"].propertyName = "+p+"; }   var err =   ",!1!==e.createErrors?(a+=" { keyword: 'propertyNames' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { propertyName: '"+g+"' } ",!1!==e.opts.messages&&(a+=" , message: 'property name \\'"+g+"\\' is invalid' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",!e.compositeRule&&u&&(a+=e.async?" throw new ValidationError(vErrors); ":" validate.errors = vErrors; return false; "),u&&(a+=" break; "),a+=" } }"}return u&&(a+="  if ("+h+" == errors) {"),a=e.util.cleanUpCode(a)}},{}],34:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s,o=" ",i=e.dataLevel,n=e.schema[r],l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(i||""),h="valid"+e.level;if("#"==n||"#/"==n)e.isRoot?(a=e.async,s="validate"):(a=!0===e.root.schema.$async,s="root.refVal[0]");else{var d=e.resolveRef(e.baseId,n,e.isRoot);if(void 0===d){var f=e.MissingRefError.message(e.baseId,n);if("fail"==e.opts.missingRefs){e.logger.error(f),(g=g||[]).push(o),o="",!1!==e.createErrors?(o+=" { keyword: '$ref' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { ref: '"+e.util.escapeQuotes(n)+"' } ",!1!==e.opts.messages&&(o+=" , message: 'can\\'t resolve reference "+e.util.escapeQuotes(n)+"' "),e.opts.verbose&&(o+=" , schema: "+e.util.toQuotedString(n)+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),o+=" } "):o+=" {} ";var p=o;o=g.pop(),o+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+p+"]); ":" validate.errors = ["+p+"]; return false; ":" var err = "+p+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",u&&(o+=" if (false) { ")}else{if("ignore"!=e.opts.missingRefs)throw new e.MissingRefError(e.baseId,n,f);e.logger.warn(f),u&&(o+=" if (true) { ")}}else if(d.inline){var m=e.util.copy(e);m.level++;var v="valid"+m.level;m.schema=d.schema,m.schemaPath="",m.errSchemaPath=n,o+=" "+e.validate(m).replace(/validate\.schema/g,d.code)+" ",u&&(o+=" if ("+v+") { ")}else a=!0===d.$async||e.async&&!1!==d.$async,s=d.code}if(s){var g;(g=g||[]).push(o),o="",o+=e.opts.passContext?" "+s+".call(this, ":" "+s+"( ",o+=" "+c+", (dataPath || '')",'""'!=e.errorPath&&(o+=" + "+e.errorPath);var y=o+=" , "+(i?"data"+(i-1||""):"parentData")+" , "+(i?e.dataPathArr[i]:"parentDataProperty")+", rootData)  ";if(o=g.pop(),a){if(!e.async)throw new Error("async schema referenced by sync schema");u&&(o+=" var "+h+"; "),o+=" try { await "+y+"; ",u&&(o+=" "+h+" = true; "),o+=" } catch (e) { if (!(e instanceof ValidationError)) throw e; if (vErrors === null) vErrors = e.errors; else vErrors = vErrors.concat(e.errors); errors = vErrors.length; ",u&&(o+=" "+h+" = false; "),o+=" } ",u&&(o+=" if ("+h+") { ")}else o+=" if (!"+y+") { if (vErrors === null) vErrors = "+s+".errors; else vErrors = vErrors.concat("+s+".errors); errors = vErrors.length; } ",u&&(o+=" else { ")}return o}},{}],35:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a=" ",s=e.level,o=e.dataLevel,i=e.schema[r],n=e.schemaPath+e.util.getProperty(r),l=e.errSchemaPath+"/"+r,u=!e.opts.allErrors,c="data"+(o||""),h="valid"+s,d=e.opts.$data&&i&&i.$data;d&&(a+=" var schema"+s+" = "+e.util.getData(i.$data,o,e.dataPathArr)+"; ");var f="schema"+s;if(!d)if(i.length<e.opts.loopRequired&&e.schema.properties&&Object.keys(e.schema.properties).length){var p=[],m=i;if(m)for(var v,g=-1,y=m.length-1;g<y;){v=m[g+=1];var P=e.schema.properties[v];P&&e.util.schemaHasRules(P,e.RULES.all)||(p[p.length]=v)}}else p=i;if(d||p.length){var E=e.errorPath,w=d||e.opts.loopRequired<=p.length,S=e.opts.ownProperties;if(u)if(a+=" var missing"+s+"; ",w){d||(a+=" var "+f+" = validate.schema"+n+"; ");var b="' + "+(D="schema"+s+"["+(x="i"+s)+"]")+" + '";e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPathExpr(E,D,e.opts.jsonPointers)),a+=" var "+h+" = true; ",d&&(a+=" if (schema"+s+" === undefined) "+h+" = true; else if (!Array.isArray(schema"+s+")) "+h+" = false; else {"),a+=" for (var "+x+" = 0; "+x+" < "+f+".length; "+x+"++) { "+h+" = "+c+"["+f+"["+x+"]] !== undefined ",S&&(a+=" &&   Object.prototype.hasOwnProperty.call("+c+", "+f+"["+x+"]) "),a+="; if (!"+h+") break; } ",d&&(a+="  }  "),($=$||[]).push(a+="  if (!"+h+") {   "),a="",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+b+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+b+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";var _=a;a=$.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+_+"]); ":" validate.errors = ["+_+"]; return false; ":" var err = "+_+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } else { "}else{a+=" if ( ";var F=p;if(F)for(var x=-1,R=F.length-1;x<R;){I=F[x+=1],x&&(a+=" || "),a+=" ( ( "+(k=c+(C=e.util.getProperty(I)))+" === undefined ",S&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(I)+"') "),a+=") && (missing"+s+" = "+e.util.toQuotedString(e.opts.jsonPointers?I:C)+") ) "}a+=") {  ";var $;b="' + "+(D="missing"+s)+" + '";e.opts._errorDataPathProperty&&(e.errorPath=e.opts.jsonPointers?e.util.getPathExpr(E,D,!0):E+" + "+D),($=$||[]).push(a),a="",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+b+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+b+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ";_=a;a=$.pop(),a+=!e.compositeRule&&u?e.async?" throw new ValidationError(["+_+"]); ":" validate.errors = ["+_+"]; return false; ":" var err = "+_+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",a+=" } else { "}else if(w){d||(a+=" var "+f+" = validate.schema"+n+"; ");var D;b="' + "+(D="schema"+s+"["+(x="i"+s)+"]")+" + '";e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPathExpr(E,D,e.opts.jsonPointers)),d&&(a+=" if ("+f+" && !Array.isArray("+f+")) {  var err =   ",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+b+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+b+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } else if ("+f+" !== undefined) { "),a+=" for (var "+x+" = 0; "+x+" < "+f+".length; "+x+"++) { if ("+c+"["+f+"["+x+"]] === undefined ",S&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", "+f+"["+x+"]) "),a+=") {  var err =   ",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+b+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+b+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } } ",d&&(a+="  }  ")}else{var j=p;if(j)for(var I,O=-1,A=j.length-1;O<A;){I=j[O+=1];var C=e.util.getProperty(I),k=(b=e.util.escapeQuotes(I),c+C);e.opts._errorDataPathProperty&&(e.errorPath=e.util.getPath(E,I,e.opts.jsonPointers)),a+=" if ( "+k+" === undefined ",S&&(a+=" || ! Object.prototype.hasOwnProperty.call("+c+", '"+e.util.escapeQuotes(I)+"') "),a+=") {  var err =   ",!1!==e.createErrors?(a+=" { keyword: 'required' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(l)+" , params: { missingProperty: '"+b+"' } ",!1!==e.opts.messages&&(a+=" , message: '",a+=e.opts._errorDataPathProperty?"is a required property":"should have required property \\'"+b+"\\'",a+="' "),e.opts.verbose&&(a+=" , schema: validate.schema"+n+" , parentSchema: validate.schema"+e.schemaPath+" , data: "+c+" "),a+=" } "):a+=" {} ",a+=";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } "}}e.errorPath=E}else u&&(a+=" if (true) {");return a}},{}],36:[function(e,r,t){"use strict";r.exports=function(e,r,t){var a,s=" ",o=e.level,i=e.dataLevel,n=e.schema[r],l=e.schemaPath+e.util.getProperty(r),u=e.errSchemaPath+"/"+r,c=!e.opts.allErrors,h="data"+(i||""),d="valid"+o,f=e.opts.$data&&n&&n.$data;if(f?(s+=" var schema"+o+" = "+e.util.getData(n.$data,i,e.dataPathArr)+"; ",a="schema"+o):a=n,(n||f)&&!1!==e.opts.uniqueItems){f&&(s+=" var "+d+"; if ("+a+" === false || "+a+" === undefined) "+d+" = true; else if (typeof "+a+" != 'boolean') "+d+" = false; else { "),s+=" var i = "+h+".length , "+d+" = true , j; if (i > 1) { ";var p=e.schema.items&&e.schema.items.type,m=Array.isArray(p);if(!p||"object"==p||"array"==p||m&&(0<=p.indexOf("object")||0<=p.indexOf("array")))s+=" outer: for (;i--;) { for (j = i; j--;) { if (equal("+h+"[i], "+h+"[j])) { "+d+" = false; break outer; } } } ";else s+=" var itemIndices = {}, item; for (;i--;) { var item = "+h+"[i]; ",s+=" if ("+e.util["checkDataType"+(m?"s":"")](p,"item",!0)+") continue; ",m&&(s+=" if (typeof item == 'string') item = '\"' + item; "),s+=" if (typeof itemIndices[item] == 'number') { "+d+" = false; j = itemIndices[item]; break; } itemIndices[item] = i; } ";s+=" } ",f&&(s+="  }  ");var v=v||[];v.push(s+=" if (!"+d+") {   "),s="",!1!==e.createErrors?(s+=" { keyword: 'uniqueItems' , dataPath: (dataPath || '') + "+e.errorPath+" , schemaPath: "+e.util.toQuotedString(u)+" , params: { i: i, j: j } ",!1!==e.opts.messages&&(s+=" , message: 'should NOT have duplicate items (items ## ' + j + ' and ' + i + ' are identical)' "),e.opts.verbose&&(s+=" , schema:  ",s+=f?"validate.schema"+l:""+n,s+="         , parentSchema: validate.schema"+e.schemaPath+" , data: "+h+" "),s+=" } "):s+=" {} ";var g=s;s=v.pop(),s+=!e.compositeRule&&c?e.async?" throw new ValidationError(["+g+"]); ":" validate.errors = ["+g+"]; return false; ":" var err = "+g+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",s+=" } ",c&&(s+=" else { ")}else c&&(s+=" if (true) { ");return s}},{}],37:[function(e,r,t){"use strict";r.exports=function(a,e,r){var t="",s=!0===a.schema.$async,o=a.util.schemaHasRulesExcept(a.schema,a.RULES.all,"$ref"),i=a.self._getId(a.schema);if(a.isTop&&(t+=" var validate = ",s&&(a.async=!0,t+="async "),t+="function(data, dataPath, parentData, parentDataProperty, rootData) { 'use strict'; ",i&&(a.opts.sourceCode||a.opts.processCode)&&(t+=" /*# sourceURL="+i+" */ ")),"boolean"==typeof a.schema||!o&&!a.schema.$ref){var n=a.level,l=a.dataLevel,u=a.schema[e="false schema"],c=a.schemaPath+a.util.getProperty(e),h=a.errSchemaPath+"/"+e,d=!a.opts.allErrors,f="data"+(l||""),p="valid"+n;if(!1===a.schema){a.isTop?d=!0:t+=" var "+p+" = false; ",(K=K||[]).push(t),t="",!1!==a.createErrors?(t+=" { keyword: 'false schema' , dataPath: (dataPath || '') + "+a.errorPath+" , schemaPath: "+a.util.toQuotedString(h)+" , params: {} ",!1!==a.opts.messages&&(t+=" , message: 'boolean schema is false' "),a.opts.verbose&&(t+=" , schema: false , parentSchema: validate.schema"+a.schemaPath+" , data: "+f+" "),t+=" } "):t+=" {} ";var m=t;t=K.pop(),t+=!a.compositeRule&&d?a.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; "}else t+=a.isTop?s?" return data; ":" validate.errors = null; return true; ":" var "+p+" = true; ";return a.isTop&&(t+=" }; return validate; "),t}if(a.isTop){var v=a.isTop;n=a.level=0,l=a.dataLevel=0,f="data";a.rootId=a.resolve.fullPath(a.self._getId(a.root.schema)),a.baseId=a.baseId||a.rootId,delete a.isTop,a.dataPathArr=[void 0],t+=" var vErrors = null; ",t+=" var errors = 0;     ",t+=" if (rootData === undefined) rootData = data; "}else{n=a.level,f="data"+((l=a.dataLevel)||"");if(i&&(a.baseId=a.resolve.url(a.baseId,i)),s&&!a.async)throw new Error("async schema in sync schema");t+=" var errs_"+n+" = errors;"}p="valid"+n,d=!a.opts.allErrors;var g="",y="",P=a.schema.type,E=Array.isArray(P);if(E&&1==P.length&&(P=P[0],E=!1),a.schema.$ref&&o){if("fail"==a.opts.extendRefs)throw new Error('$ref: validation keywords used in schema at path "'+a.errSchemaPath+'" (see option extendRefs)');!0!==a.opts.extendRefs&&(o=!1,a.logger.warn('$ref: keywords ignored in schema at path "'+a.errSchemaPath+'"'))}if(a.schema.$comment&&a.opts.$comment&&(t+=" "+a.RULES.all.$comment.code(a,"$comment")),P){if(a.opts.coerceTypes)var w=a.util.coerceToTypes(a.opts.coerceTypes,P);var S=a.RULES.types[P];if(w||E||!0===S||S&&!J(S)){c=a.schemaPath+".type",h=a.errSchemaPath+"/type",c=a.schemaPath+".type",h=a.errSchemaPath+"/type";if(t+=" if ("+a.util[E?"checkDataTypes":"checkDataType"](P,f,!0)+") { ",w){var b="dataType"+n,_="coerced"+n;t+=" var "+b+" = typeof "+f+"; ","array"==a.opts.coerceTypes&&(t+=" if ("+b+" == 'object' && Array.isArray("+f+")) "+b+" = 'array'; "),t+=" var "+_+" = undefined; ";var F="",x=w;if(x)for(var R,$=-1,D=x.length-1;$<D;)R=x[$+=1],$&&(t+=" if ("+_+" === undefined) { ",F+="}"),"array"==a.opts.coerceTypes&&"array"!=R&&(t+=" if ("+b+" == 'array' && "+f+".length == 1) { "+_+" = "+f+" = "+f+"[0]; "+b+" = typeof "+f+";  } "),"string"==R?t+=" if ("+b+" == 'number' || "+b+" == 'boolean') "+_+" = '' + "+f+"; else if ("+f+" === null) "+_+" = ''; ":"number"==R||"integer"==R?(t+=" if ("+b+" == 'boolean' || "+f+" === null || ("+b+" == 'string' && "+f+" && "+f+" == +"+f+" ","integer"==R&&(t+=" && !("+f+" % 1)"),t+=")) "+_+" = +"+f+"; "):"boolean"==R?t+=" if ("+f+" === 'false' || "+f+" === 0 || "+f+" === null) "+_+" = false; else if ("+f+" === 'true' || "+f+" === 1) "+_+" = true; ":"null"==R?t+=" if ("+f+" === '' || "+f+" === 0 || "+f+" === false) "+_+" = null; ":"array"==a.opts.coerceTypes&&"array"==R&&(t+=" if ("+b+" == 'string' || "+b+" == 'number' || "+b+" == 'boolean' || "+f+" == null) "+_+" = ["+f+"]; ");(K=K||[]).push(t+=" "+F+" if ("+_+" === undefined) {   "),t="",!1!==a.createErrors?(t+=" { keyword: 'type' , dataPath: (dataPath || '') + "+a.errorPath+" , schemaPath: "+a.util.toQuotedString(h)+" , params: { type: '",t+=E?""+P.join(","):""+P,t+="' } ",!1!==a.opts.messages&&(t+=" , message: 'should be ",t+=E?""+P.join(","):""+P,t+="' "),a.opts.verbose&&(t+=" , schema: validate.schema"+c+" , parentSchema: validate.schema"+a.schemaPath+" , data: "+f+" "),t+=" } "):t+=" {} ";m=t;t=K.pop(),t+=!a.compositeRule&&d?a.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",t+=" } else {  ";var j=l?"data"+(l-1||""):"parentData";t+=" "+f+" = "+_+"; ",l||(t+="if ("+j+" !== undefined)"),t+=" "+j+"["+(l?a.dataPathArr[l]:"parentDataProperty")+"] = "+_+"; } "}else{(K=K||[]).push(t),t="",!1!==a.createErrors?(t+=" { keyword: 'type' , dataPath: (dataPath || '') + "+a.errorPath+" , schemaPath: "+a.util.toQuotedString(h)+" , params: { type: '",t+=E?""+P.join(","):""+P,t+="' } ",!1!==a.opts.messages&&(t+=" , message: 'should be ",t+=E?""+P.join(","):""+P,t+="' "),a.opts.verbose&&(t+=" , schema: validate.schema"+c+" , parentSchema: validate.schema"+a.schemaPath+" , data: "+f+" "),t+=" } "):t+=" {} ";m=t;t=K.pop(),t+=!a.compositeRule&&d?a.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; "}t+=" } "}}if(a.schema.$ref&&!o)t+=" "+a.RULES.all.$ref.code(a,"$ref")+" ",d&&(t+=" } if (errors === ",t+=v?"0":"errs_"+n,t+=") { ",y+="}");else{var I=a.RULES;if(I)for(var O=-1,A=I.length-1;O<A;)if(J(S=I[O+=1])){if(S.type&&(t+=" if ("+a.util.checkDataType(S.type,f)+") { "),a.opts.useDefaults&&!a.compositeRule)if("object"==S.type&&a.schema.properties){u=a.schema.properties;var C=Object.keys(u);if(C)for(var k,L=-1,z=C.length-1;L<z;){if(void 0!==(N=u[k=C[L+=1]]).default)t+="  if ("+(U=f+a.util.getProperty(k))+" === undefined) "+U+" = ",t+="shared"==a.opts.useDefaults?" "+a.useDefault(N.default)+" ":" "+JSON.stringify(N.default)+" ",t+="; "}}else if("array"==S.type&&Array.isArray(a.schema.items)){var T=a.schema.items;if(T){$=-1;for(var N,q=T.length-1;$<q;){var U;if(void 0!==(N=T[$+=1]).default)t+="  if ("+(U=f+"["+$+"]")+" === undefined) "+U+" = ",t+="shared"==a.opts.useDefaults?" "+a.useDefault(N.default)+" ":" "+JSON.stringify(N.default)+" ",t+="; "}}}var Q=S.rules;if(Q)for(var V,H=-1,M=Q.length-1;H<M;)if(Z(V=Q[H+=1])){var B=V.code(a,V.keyword,S.type);B&&(t+=" "+B+" ",d&&(g+="}"))}if(d&&(t+=" "+g+" ",g=""),S.type&&(t+=" } ",P&&P===S.type&&!w)){var K;c=a.schemaPath+".type",h=a.errSchemaPath+"/type";(K=K||[]).push(t+=" else { "),t="",!1!==a.createErrors?(t+=" { keyword: 'type' , dataPath: (dataPath || '') + "+a.errorPath+" , schemaPath: "+a.util.toQuotedString(h)+" , params: { type: '",t+=E?""+P.join(","):""+P,t+="' } ",!1!==a.opts.messages&&(t+=" , message: 'should be ",t+=E?""+P.join(","):""+P,t+="' "),a.opts.verbose&&(t+=" , schema: validate.schema"+c+" , parentSchema: validate.schema"+a.schemaPath+" , data: "+f+" "),t+=" } "):t+=" {} ";m=t;t=K.pop(),t+=!a.compositeRule&&d?a.async?" throw new ValidationError(["+m+"]); ":" validate.errors = ["+m+"]; return false; ":" var err = "+m+";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ",t+=" } "}d&&(t+=" if (errors === ",t+=v?"0":"errs_"+n,t+=") { ",y+="}")}}function J(e){for(var r=e.rules,t=0;t<r.length;t++)if(Z(r[t]))return!0}function Z(e){return void 0!==a.schema[e.keyword]||e.implements&&function(e){for(var r=e.implements,t=0;t<r.length;t++)if(void 0!==a.schema[r[t]])return!0}(e)}return d&&(t+=" "+y+" "),v?(s?(t+=" if (errors === 0) return data;           ",t+=" else throw new ValidationError(vErrors); "):(t+=" validate.errors = vErrors; ",t+=" return errors === 0;       "),t+=" }; return validate;"):t+=" var "+p+" = errors === errs_"+n+";",t=a.util.cleanUpCode(t),v&&(t=a.util.finalCleanUpCode(t,s)),t}},{}],38:[function(e,r,t){"use strict";var c=/^[a-z_$][a-z0-9_$-]*$/i,h=e("./dotjs/custom");r.exports={add:function(e,r){var n=this.RULES;if(n.keywords[e])throw new Error("Keyword "+e+" is already defined");if(!c.test(e))throw new Error("Keyword "+e+" is not a valid identifier");if(r){if(r.macro&&void 0!==r.valid)throw new Error('"valid" option cannot be used with macro keywords');var t=r.type;if(Array.isArray(t)){var a,s=t.length;for(a=0;a<s;a++)u(t[a]);for(a=0;a<s;a++)l(e,t[a],r)}else t&&u(t),l(e,t,r);var o=!0===r.$data&&this._opts.$data;if(o&&!r.validate)throw new Error('$data support: "validate" function is not defined');var i=r.metaSchema;i&&(o&&(i={anyOf:[i,{$ref:"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#"}]}),r.validateSchema=this.compile(i,!0))}function l(e,r,t){for(var a,s=0;s<n.length;s++){var o=n[s];if(o.type==r){a=o;break}}a||n.push(a={type:r,rules:[]});var i={keyword:e,definition:t,custom:!0,code:h,implements:t.implements};a.rules.push(i),n.custom[e]=i}function u(e){if(!n.types[e])throw new Error("Unknown type "+e)}return n.keywords[e]=n.all[e]=!0,this},get:function(e){var r=this.RULES.custom[e];return r?r.definition:this.RULES.keywords[e]||!1},remove:function(e){var r=this.RULES;delete r.keywords[e],delete r.all[e],delete r.custom[e];for(var t=0;t<r.length;t++)for(var a=r[t].rules,s=0;s<a.length;s++)if(a[s].keyword==e){a.splice(s,1);break}return this}}},{"./dotjs/custom":21}],39:[function(e,r,t){r.exports={$schema:"http://json-schema.org/draft-07/schema#",$id:"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#",description:"Meta-schema for $data reference (JSON Schema extension proposal)",type:"object",required:["$data"],properties:{$data:{type:"string",anyOf:[{format:"relative-json-pointer"},{format:"json-pointer"}]}},additionalProperties:!1}},{}],40:[function(e,r,t){r.exports={$schema:"http://json-schema.org/draft-07/schema#",$id:"http://json-schema.org/draft-07/schema#",title:"Core schema meta-schema",definitions:{schemaArray:{type:"array",minItems:1,items:{$ref:"#"}},nonNegativeInteger:{type:"integer",minimum:0},nonNegativeIntegerDefault0:{allOf:[{$ref:"#/definitions/nonNegativeInteger"},{default:0}]},simpleTypes:{enum:["array","boolean","integer","null","number","object","string"]},stringArray:{type:"array",items:{type:"string"},uniqueItems:!0,default:[]}},type:["object","boolean"],properties:{$id:{type:"string",format:"uri-reference"},$schema:{type:"string",format:"uri"},$ref:{type:"string",format:"uri-reference"},$comment:{type:"string"},title:{type:"string"},description:{type:"string"},default:!0,readOnly:{type:"boolean",default:!1},examples:{type:"array",items:!0},multipleOf:{type:"number",exclusiveMinimum:0},maximum:{type:"number"},exclusiveMaximum:{type:"number"},minimum:{type:"number"},exclusiveMinimum:{type:"number"},maxLength:{$ref:"#/definitions/nonNegativeInteger"},minLength:{$ref:"#/definitions/nonNegativeIntegerDefault0"},pattern:{type:"string",format:"regex"},additionalItems:{$ref:"#"},items:{anyOf:[{$ref:"#"},{$ref:"#/definitions/schemaArray"}],default:!0},maxItems:{$ref:"#/definitions/nonNegativeInteger"},minItems:{$ref:"#/definitions/nonNegativeIntegerDefault0"},uniqueItems:{type:"boolean",default:!1},contains:{$ref:"#"},maxProperties:{$ref:"#/definitions/nonNegativeInteger"},minProperties:{$ref:"#/definitions/nonNegativeIntegerDefault0"},required:{$ref:"#/definitions/stringArray"},additionalProperties:{$ref:"#"},definitions:{type:"object",additionalProperties:{$ref:"#"},default:{}},properties:{type:"object",additionalProperties:{$ref:"#"},default:{}},patternProperties:{type:"object",additionalProperties:{$ref:"#"},propertyNames:{format:"regex"},default:{}},dependencies:{type:"object",additionalProperties:{anyOf:[{$ref:"#"},{$ref:"#/definitions/stringArray"}]}},propertyNames:{$ref:"#"},const:!0,enum:{type:"array",items:!0,minItems:1,uniqueItems:!0},type:{anyOf:[{$ref:"#/definitions/simpleTypes"},{type:"array",items:{$ref:"#/definitions/simpleTypes"},minItems:1,uniqueItems:!0}]},format:{type:"string"},contentMediaType:{type:"string"},contentEncoding:{type:"string"},if:{$ref:"#"},then:{$ref:"#"},else:{$ref:"#"},allOf:{$ref:"#/definitions/schemaArray"},anyOf:{$ref:"#/definitions/schemaArray"},oneOf:{$ref:"#/definitions/schemaArray"},not:{$ref:"#"}},default:!0}},{}],41:[function(e,r,t){"use strict";var f=Array.isArray,p=Object.keys,m=Object.prototype.hasOwnProperty;r.exports=function e(r,t){if(r===t)return!0;if(r&&t&&"object"==typeof r&&"object"==typeof t){var a,s,o,i=f(r),n=f(t);if(i&&n){if((s=r.length)!=t.length)return!1;for(a=s;0!=a--;)if(!e(r[a],t[a]))return!1;return!0}if(i!=n)return!1;var l=r instanceof Date,u=t instanceof Date;if(l!=u)return!1;if(l&&u)return r.getTime()==t.getTime();var c=r instanceof RegExp,h=t instanceof RegExp;if(c!=h)return!1;if(c&&h)return r.toString()==t.toString();var d=p(r);if((s=d.length)!==p(t).length)return!1;for(a=s;0!=a--;)if(!m.call(t,d[a]))return!1;for(a=s;0!=a--;)if(!e(r[o=d[a]],t[o]))return!1;return!0}return r!=r&&t!=t}},{}],42:[function(e,r,t){"use strict";r.exports=function(e,r){r||(r={}),"function"==typeof r&&(r={cmp:r});var a,l="boolean"==typeof r.cycles&&r.cycles,u=r.cmp&&(a=r.cmp,function(t){return function(e,r){return a({key:e,value:t[e]},{key:r,value:t[r]})}}),c=[];return function e(r){if(r&&r.toJSON&&"function"==typeof r.toJSON&&(r=r.toJSON()),void 0!==r){if("number"==typeof r)return isFinite(r)?""+r:"null";if("object"!=typeof r)return JSON.stringify(r);var t,a;if(Array.isArray(r)){for(a="[",t=0;t<r.length;t++)t&&(a+=","),a+=e(r[t])||"null";return a+"]"}if(null===r)return"null";if(-1!==c.indexOf(r)){if(l)return JSON.stringify("__cycle__");throw new TypeError("Converting circular structure to JSON")}var s=c.push(r)-1,o=Object.keys(r).sort(u&&u(r));for(a="",t=0;t<o.length;t++){var i=o[t],n=e(r[i]);n&&(a&&(a+=","),a+=JSON.stringify(i)+":"+n)}return c.splice(s,1),"{"+a+"}"}}(e)}},{}],43:[function(e,r,t){"use strict";var p=r.exports=function(e,r,t){"function"==typeof r&&(t=r,r={}),function e(r,t,a,s,o,i,n,l,u){if(a&&"object"==typeof a&&!Array.isArray(a))for(var c in t(a,s,o,i,n,l,u),a){var h=a[c];if(Array.isArray(h)){if(c in p.arrayKeywords)for(var d=0;d<h.length;d++)e(r,t,h[d],s+"/"+c+"/"+d,o,s,c,a,d)}else if(c in p.propsKeywords){if(h&&"object"==typeof h)for(var f in h)e(r,t,h[f],s+"/"+c+"/"+f.replace(/~/g,"~0").replace(/\//g,"~1"),o,s,c,a,f)}else(c in p.keywords||r.allKeys&&!(c in p.skipKeywords))&&e(r,t,h,s+"/"+c,o,s,c,a)}}(r,t,e,"",e)};p.keywords={additionalItems:!0,items:!0,contains:!0,additionalProperties:!0,propertyNames:!0,not:!0},p.arrayKeywords={items:!0,allOf:!0,anyOf:!0,oneOf:!0},p.propsKeywords={definitions:!0,properties:!0,patternProperties:!0,dependencies:!0},p.skipKeywords={enum:!0,const:!0,required:!0,maximum:!0,minimum:!0,exclusiveMaximum:!0,exclusiveMinimum:!0,multipleOf:!0,maxLength:!0,minLength:!0,pattern:!0,format:!0,maxItems:!0,minItems:!0,uniqueItems:!0,maxProperties:!0,minProperties:!0}},{}],44:[function(e,r,t){var a;a=this,function(e){"use strict";function C(){for(var e=arguments.length,r=Array(e),t=0;t<e;t++)r[t]=arguments[t];if(1<r.length){r[0]=r[0].slice(0,-1);for(var a=r.length-1,s=1;s<a;++s)r[s]=r[s].slice(1,-1);return r[a]=r[a].slice(1),r.join("")}return r[0]}function k(e){return"(?:"+e+")"}function a(e){return void 0===e?"undefined":null===e?"null":Object.prototype.toString.call(e).split(" ").pop().split("]").shift().toLowerCase()}function p(e){return e.toUpperCase()}function r(e){var r="[A-Za-z]",t="[0-9]",a=C(t,"[A-Fa-f]"),s=k(k("%[EFef]"+a+"%"+a+a+"%"+a+a)+"|"+k("%[89A-Fa-f]"+a+"%"+a+a)+"|"+k("%"+a+a)),o="[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]",i=C("[\\:\\/\\?\\#\\[\\]\\@]",o),n=e?"[\\uE000-\\uF8FF]":"[]",l=C(r,t,"[\\-\\.\\_\\~]",e?"[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]":"[]"),u=k(r+C(r,t,"[\\+\\-\\.]")+"*"),c=k(k(s+"|"+C(l,o,"[\\:]"))+"*"),h=(k(k("25[0-5]")+"|"+k("2[0-4]"+t)+"|"+k("1"+t+t)+"|"+k("[1-9]"+t)+"|"+t),k(k("25[0-5]")+"|"+k("2[0-4]"+t)+"|"+k("1"+t+t)+"|"+k("0?[1-9]"+t)+"|0?0?"+t)),d=k(h+"\\."+h+"\\."+h+"\\."+h),f=k(a+"{1,4}"),p=k(k(f+"\\:"+f)+"|"+d),m=k([k(k(f+"\\:")+"{6}"+p),k("\\:\\:"+k(f+"\\:")+"{5}"+p),k(k(f)+"?\\:\\:"+k(f+"\\:")+"{4}"+p),k(k(k(f+"\\:")+"{0,1}"+f)+"?\\:\\:"+k(f+"\\:")+"{3}"+p),k(k(k(f+"\\:")+"{0,2}"+f)+"?\\:\\:"+k(f+"\\:")+"{2}"+p),k(k(k(f+"\\:")+"{0,3}"+f)+"?\\:\\:"+f+"\\:"+p),k(k(k(f+"\\:")+"{0,4}"+f)+"?\\:\\:"+p),k(k(k(f+"\\:")+"{0,5}"+f)+"?\\:\\:"+f),k(k(k(f+"\\:")+"{0,6}"+f)+"?\\:\\:")].join("|")),v=k(k(l+"|"+s)+"+"),g=(k(m+"\\%25"+v),k("\\["+k(k(m+k("\\%25|\\%(?!"+a+"{2})")+v)+"|"+m+"|"+k("[vV]"+a+"+\\."+C(l,o,"[\\:]")+"+"))+"\\]")),y=k(k(s+"|"+C(l,o))+"*"),P=k(g+"|"+d+"(?!"+y+")|"+y),E=k(t+"*"),w=k(k(c+"@")+"?"+P+k("\\:"+E)+"?"),S=k(s+"|"+C(l,o,"[\\:\\@]")),b=k(S+"*"),_=k(S+"+"),F=k(k(s+"|"+C(l,o,"[\\@]"))+"+"),x=k(k("\\/"+b)+"*"),R=k("\\/"+k(_+x)+"?"),$=k(F+x),D=k(_+x),j="(?!"+S+")",I=(k(x+"|"+R+"|"+$+"|"+D+"|"+j),k(k(S+"|"+C("[\\/\\?]",n))+"*")),O=k(k(S+"|[\\/\\?]")+"*"),A=k(k("\\/\\/"+w+x)+"|"+R+"|"+D+"|"+j);k(k(u+"\\:"+A+k("\\?"+I)+"?"+k("\\#"+O)+"?")+"|"+k(k(k("\\/\\/"+w+x)+"|"+R+"|"+$+"|"+j)+k("\\?"+I)+"?"+k("\\#"+O)+"?")),k(u+"\\:"+A+k("\\?"+I)+"?"),k(k("\\/\\/("+k("("+c+")@")+"?("+P+")"+k("\\:("+E+")")+"?)")+"?("+x+"|"+R+"|"+D+"|"+j+")"),k("\\?("+I+")"),k("\\#("+O+")"),k(k("\\/\\/("+k("("+c+")@")+"?("+P+")"+k("\\:("+E+")")+"?)")+"?("+x+"|"+R+"|"+$+"|"+j+")"),k("\\?("+I+")"),k("\\#("+O+")"),k(k("\\/\\/("+k("("+c+")@")+"?("+P+")"+k("\\:("+E+")")+"?)")+"?("+x+"|"+R+"|"+D+"|"+j+")"),k("\\?("+I+")"),k("\\#("+O+")"),k("("+c+")@"),k("\\:("+E+")");return{NOT_SCHEME:new RegExp(C("[^]",r,t,"[\\+\\-\\.]"),"g"),NOT_USERINFO:new RegExp(C("[^\\%\\:]",l,o),"g"),NOT_HOST:new RegExp(C("[^\\%\\[\\]\\:]",l,o),"g"),NOT_PATH:new RegExp(C("[^\\%\\/\\:\\@]",l,o),"g"),NOT_PATH_NOSCHEME:new RegExp(C("[^\\%\\/\\@]",l,o),"g"),NOT_QUERY:new RegExp(C("[^\\%]",l,o,"[\\:\\@\\/\\?]",n),"g"),NOT_FRAGMENT:new RegExp(C("[^\\%]",l,o,"[\\:\\@\\/\\?]"),"g"),ESCAPE:new RegExp(C("[^]",l,o),"g"),UNRESERVED:new RegExp(l,"g"),OTHER_CHARS:new RegExp(C("[^\\%]",l,i),"g"),PCT_ENCODED:new RegExp(s,"g"),IPV4ADDRESS:new RegExp("^("+d+")$"),IPV6ADDRESS:new RegExp("^\\[?("+m+")"+k(k("\\%25|\\%(?!"+a+"{2})")+"("+v+")")+"?\\]?$")}}var c=r(!1),h=r(!0),w=function(e,r){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return function(e,r){var t=[],a=!0,s=!1,o=void 0;try{for(var i,n=e[Symbol.iterator]();!(a=(i=n.next()).done)&&(t.push(i.value),!r||t.length!==r);a=!0);}catch(e){s=!0,o=e}finally{try{!a&&n.return&&n.return()}finally{if(s)throw o}}return t}(e,r);throw new TypeError("Invalid attempt to destructure non-iterable instance")},A=2147483647,t=/^xn--/,s=/[^\0-\x7E]/,o=/[\x2E\u3002\uFF0E\uFF61]/g,i={overflow:"Overflow: input needs wider integers to process","not-basic":"Illegal input >= 0x80 (not a basic code point)","invalid-input":"Invalid input"},L=Math.floor,z=String.fromCharCode;function T(e){throw new RangeError(i[e])}function n(e,r){var t=e.split("@"),a="";return 1<t.length&&(a=t[0]+"@",e=t[1]),a+function(e,r){for(var t=[],a=e.length;a--;)t[a]=r(e[a]);return t}((e=e.replace(o,".")).split("."),r).join(".")}function N(e){for(var r=[],t=0,a=e.length;t<a;){var s=e.charCodeAt(t++);if(55296<=s&&s<=56319&&t<a){var o=e.charCodeAt(t++);56320==(64512&o)?r.push(((1023&s)<<10)+(1023&o)+65536):(r.push(s),t--)}else r.push(s)}return r}var q=function(e,r){return e+22+75*(e<26)-((0!=r)<<5)},U=function(e,r,t){var a=0;for(e=t?L(e/700):e>>1,e+=L(e/r);455<e;a+=36)e=L(e/35);return L(a+36*e/(e+38))},l=function(e){var r,t=[],a=e.length,s=0,o=128,i=72,n=e.lastIndexOf("-");n<0&&(n=0);for(var l=0;l<n;++l)128<=e.charCodeAt(l)&&T("not-basic"),t.push(e.charCodeAt(l));for(var u=0<n?n+1:0;u<a;){for(var c=s,h=1,d=36;;d+=36){a<=u&&T("invalid-input");var f=(r=e.charCodeAt(u++))-48<10?r-22:r-65<26?r-65:r-97<26?r-97:36;(36<=f||f>L((A-s)/h))&&T("overflow"),s+=f*h;var p=d<=i?1:i+26<=d?26:d-i;if(f<p)break;var m=36-p;h>L(A/m)&&T("overflow"),h*=m}var v=t.length+1;i=U(s-c,v,0==c),L(s/v)>A-o&&T("overflow"),o+=L(s/v),s%=v,t.splice(s++,0,o)}return String.fromCodePoint.apply(String,t)},u=function(e){var r=[],t=(e=N(e)).length,a=128,s=0,o=72,i=!0,n=!1,l=void 0;try{for(var u,c=e[Symbol.iterator]();!(i=(u=c.next()).done);i=!0){var h=u.value;h<128&&r.push(z(h))}}catch(e){n=!0,l=e}finally{try{!i&&c.return&&c.return()}finally{if(n)throw l}}var d=r.length,f=d;for(d&&r.push("-");f<t;){var p=A,m=!0,v=!1,g=void 0;try{for(var y,P=e[Symbol.iterator]();!(m=(y=P.next()).done);m=!0){var E=y.value;a<=E&&E<p&&(p=E)}}catch(e){v=!0,g=e}finally{try{!m&&P.return&&P.return()}finally{if(v)throw g}}var w=f+1;p-a>L((A-s)/w)&&T("overflow"),s+=(p-a)*w,a=p;var S=!0,b=!1,_=void 0;try{for(var F,x=e[Symbol.iterator]();!(S=(F=x.next()).done);S=!0){var R=F.value;if(R<a&&++s>A&&T("overflow"),R==a){for(var $=s,D=36;;D+=36){var j=D<=o?1:o+26<=D?26:D-o;if($<j)break;var I=$-j,O=36-j;r.push(z(q(j+I%O,0))),$=L(I/O)}r.push(z(q($,0))),o=U(s,w,f==d),s=0,++f}}}catch(e){b=!0,_=e}finally{try{!S&&x.return&&x.return()}finally{if(b)throw _}}++s,++a}return r.join("")},v={version:"2.1.0",ucs2:{decode:N,encode:function(e){return String.fromCodePoint.apply(String,function(e){if(Array.isArray(e)){for(var r=0,t=Array(e.length);r<e.length;r++)t[r]=e[r];return t}return Array.from(e)}(e))}},decode:l,encode:u,toASCII:function(e){return n(e,function(e){return s.test(e)?"xn--"+u(e):e})},toUnicode:function(e){return n(e,function(e){return t.test(e)?l(e.slice(4).toLowerCase()):e})}},d={};function m(e){var r=e.charCodeAt(0);return r<16?"%0"+r.toString(16).toUpperCase():r<128?"%"+r.toString(16).toUpperCase():r<2048?"%"+(r>>6|192).toString(16).toUpperCase()+"%"+(63&r|128).toString(16).toUpperCase():"%"+(r>>12|224).toString(16).toUpperCase()+"%"+(r>>6&63|128).toString(16).toUpperCase()+"%"+(63&r|128).toString(16).toUpperCase()}function f(e){for(var r="",t=0,a=e.length;t<a;){var s=parseInt(e.substr(t+1,2),16);if(s<128)r+=String.fromCharCode(s),t+=3;else if(194<=s&&s<224){if(6<=a-t){var o=parseInt(e.substr(t+4,2),16);r+=String.fromCharCode((31&s)<<6|63&o)}else r+=e.substr(t,6);t+=6}else if(224<=s){if(9<=a-t){var i=parseInt(e.substr(t+4,2),16),n=parseInt(e.substr(t+7,2),16);r+=String.fromCharCode((15&s)<<12|(63&i)<<6|63&n)}else r+=e.substr(t,9);t+=9}else r+=e.substr(t,3),t+=3}return r}function g(e,t){function r(e){var r=f(e);return r.match(t.UNRESERVED)?r:e}return e.scheme&&(e.scheme=String(e.scheme).replace(t.PCT_ENCODED,r).toLowerCase().replace(t.NOT_SCHEME,"")),void 0!==e.userinfo&&(e.userinfo=String(e.userinfo).replace(t.PCT_ENCODED,r).replace(t.NOT_USERINFO,m).replace(t.PCT_ENCODED,p)),void 0!==e.host&&(e.host=String(e.host).replace(t.PCT_ENCODED,r).toLowerCase().replace(t.NOT_HOST,m).replace(t.PCT_ENCODED,p)),void 0!==e.path&&(e.path=String(e.path).replace(t.PCT_ENCODED,r).replace(e.scheme?t.NOT_PATH:t.NOT_PATH_NOSCHEME,m).replace(t.PCT_ENCODED,p)),void 0!==e.query&&(e.query=String(e.query).replace(t.PCT_ENCODED,r).replace(t.NOT_QUERY,m).replace(t.PCT_ENCODED,p)),void 0!==e.fragment&&(e.fragment=String(e.fragment).replace(t.PCT_ENCODED,r).replace(t.NOT_FRAGMENT,m).replace(t.PCT_ENCODED,p)),e}function S(e){return e.replace(/^0*(.*)/,"$1")||"0"}function b(e,r){var t=e.match(r.IPV4ADDRESS)||[],a=w(t,2)[1];return a?a.split(".").map(S).join("."):e}function y(e,r){var t=e.match(r.IPV6ADDRESS)||[],a=w(t,3),s=a[1],o=a[2];if(s){for(var i=s.toLowerCase().split("::").reverse(),n=w(i,2),l=n[0],u=n[1],c=u?u.split(":").map(S):[],h=l.split(":").map(S),d=r.IPV4ADDRESS.test(h[h.length-1]),f=d?7:8,p=h.length-f,m=Array(f),v=0;v<f;++v)m[v]=c[v]||h[p+v]||"";d&&(m[f-1]=b(m[f-1],r));var g=m.reduce(function(e,r,t){if(!r||"0"===r){var a=e[e.length-1];a&&a.index+a.length===t?a.length++:e.push({index:t,length:1})}return e},[]).sort(function(e,r){return r.length-e.length})[0],y=void 0;if(g&&1<g.length){var P=m.slice(0,g.index),E=m.slice(g.index+g.length);y=P.join(":")+"::"+E.join(":")}else y=m.join(":");return o&&(y+="%"+o),y}return e}var P=/^(?:([^:\/?#]+):)?(?:\/\/((?:([^\/?#@]*)@)?(\[[^\/?#\]]+\]|[^\/?#:]*)(?:\:(\d*))?))?([^?#]*)(?:\?([^#]*))?(?:#((?:.|\n|\r)*))?/i,E=void 0==="".match(/(){0}/)[1];function _(e){var r=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},t={},a=!1!==r.iri?h:c;"suffix"===r.reference&&(e=(r.scheme?r.scheme+":":"")+"//"+e);var s=e.match(P);if(s){E?(t.scheme=s[1],t.userinfo=s[3],t.host=s[4],t.port=parseInt(s[5],10),t.path=s[6]||"",t.query=s[7],t.fragment=s[8],isNaN(t.port)&&(t.port=s[5])):(t.scheme=s[1]||void 0,t.userinfo=-1!==e.indexOf("@")?s[3]:void 0,t.host=-1!==e.indexOf("//")?s[4]:void 0,t.port=parseInt(s[5],10),t.path=s[6]||"",t.query=-1!==e.indexOf("?")?s[7]:void 0,t.fragment=-1!==e.indexOf("#")?s[8]:void 0,isNaN(t.port)&&(t.port=e.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/)?s[4]:void 0)),t.host&&(t.host=y(b(t.host,a),a)),t.reference=void 0!==t.scheme||void 0!==t.userinfo||void 0!==t.host||void 0!==t.port||t.path||void 0!==t.query?void 0===t.scheme?"relative":void 0===t.fragment?"absolute":"uri":"same-document",r.reference&&"suffix"!==r.reference&&r.reference!==t.reference&&(t.error=t.error||"URI is not a "+r.reference+" reference.");var o=d[(r.scheme||t.scheme||"").toLowerCase()];if(r.unicodeSupport||o&&o.unicodeSupport)g(t,a);else{if(t.host&&(r.domainHost||o&&o.domainHost))try{t.host=v.toASCII(t.host.replace(a.PCT_ENCODED,f).toLowerCase())}catch(e){t.error=t.error||"Host's domain name can not be converted to ASCII via punycode: "+e}g(t,c)}o&&o.parse&&o.parse(t,r)}else t.error=t.error||"URI can not be parsed.";return t}var F=/^\.\.?\//,x=/^\/\.(\/|$)/,R=/^\/\.\.(\/|$)/,$=/^\/?(?:.|\n)*?(?=\/|$)/;function D(e){for(var r=[];e.length;)if(e.match(F))e=e.replace(F,"");else if(e.match(x))e=e.replace(x,"/");else if(e.match(R))e=e.replace(R,"/"),r.pop();else if("."===e||".."===e)e="";else{var t=e.match($);if(!t)throw new Error("Unexpected dot segment condition");var a=t[0];e=e.slice(a.length),r.push(a)}return r.join("")}function j(r){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},e=t.iri?h:c,a=[],s=d[(t.scheme||r.scheme||"").toLowerCase()];if(s&&s.serialize&&s.serialize(r,t),r.host)if(e.IPV6ADDRESS.test(r.host));else if(t.domainHost||s&&s.domainHost)try{r.host=t.iri?v.toUnicode(r.host):v.toASCII(r.host.replace(e.PCT_ENCODED,f).toLowerCase())}catch(e){r.error=r.error||"Host's domain name can not be converted to "+(t.iri?"Unicode":"ASCII")+" via punycode: "+e}g(r,e),"suffix"!==t.reference&&r.scheme&&(a.push(r.scheme),a.push(":"));var o,i,n,l=(i=!1!==t.iri?h:c,n=[],void 0!==(o=r).userinfo&&(n.push(o.userinfo),n.push("@")),void 0!==o.host&&n.push(y(b(String(o.host),i),i).replace(i.IPV6ADDRESS,function(e,r,t){return"["+r+(t?"%25"+t:"")+"]"})),"number"==typeof o.port&&(n.push(":"),n.push(o.port.toString(10))),n.length?n.join(""):void 0);if(void 0!==l&&("suffix"!==t.reference&&a.push("//"),a.push(l),r.path&&"/"!==r.path.charAt(0)&&a.push("/")),void 0!==r.path){var u=r.path;t.absolutePath||s&&s.absolutePath||(u=D(u)),void 0===l&&(u=u.replace(/^\/\//,"/%2F")),a.push(u)}return void 0!==r.query&&(a.push("?"),a.push(r.query)),void 0!==r.fragment&&(a.push("#"),a.push(r.fragment)),a.join("")}function I(e,r){var t=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},a={};return arguments[3]||(e=_(j(e,t),t),r=_(j(r,t),t)),!(t=t||{}).tolerant&&r.scheme?(a.scheme=r.scheme,a.userinfo=r.userinfo,a.host=r.host,a.port=r.port,a.path=D(r.path||""),a.query=r.query):(void 0!==r.userinfo||void 0!==r.host||void 0!==r.port?(a.userinfo=r.userinfo,a.host=r.host,a.port=r.port,a.path=D(r.path||""),a.query=r.query):(r.path?("/"===r.path.charAt(0)?a.path=D(r.path):(a.path=void 0===e.userinfo&&void 0===e.host&&void 0===e.port||e.path?e.path?e.path.slice(0,e.path.lastIndexOf("/")+1)+r.path:r.path:"/"+r.path,a.path=D(a.path)),a.query=r.query):(a.path=e.path,a.query=void 0!==r.query?r.query:e.query),a.userinfo=e.userinfo,a.host=e.host,a.port=e.port),a.scheme=e.scheme),a.fragment=r.fragment,a}function O(e,r){return e&&e.toString().replace(r&&r.iri?h.PCT_ENCODED:c.PCT_ENCODED,f)}var Q={scheme:"http",domainHost:!0,parse:function(e,r){return e.host||(e.error=e.error||"HTTP URIs must have a host."),e},serialize:function(e,r){return e.port!==("https"!==String(e.scheme).toLowerCase()?80:443)&&""!==e.port||(e.port=void 0),e.path||(e.path="/"),e}},V={scheme:"https",domainHost:Q.domainHost,parse:Q.parse,serialize:Q.serialize},H={},M="[A-Za-z0-9\\-\\.\\_\\~\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]",B="[0-9A-Fa-f]",K=k(k("%[EFef]"+B+"%"+B+B+"%"+B+B)+"|"+k("%[89A-Fa-f]"+B+"%"+B+B)+"|"+k("%"+B+B)),J=C("[\\!\\$\\%\\'\\(\\)\\*\\+\\,\\-\\.0-9\\<\\>A-Z\\x5E-\\x7E]",'[\\"\\\\]'),Z=new RegExp(M,"g"),G=new RegExp(K,"g"),Y=new RegExp(C("[^]","[A-Za-z0-9\\!\\$\\%\\'\\*\\+\\-\\^\\_\\`\\{\\|\\}\\~]","[\\.]",'[\\"]',J),"g"),W=new RegExp(C("[^]",M,"[\\!\\$\\'\\(\\)\\*\\+\\,\\;\\:\\@]"),"g"),X=W;function ee(e){var r=f(e);return r.match(Z)?r:e}var re={scheme:"mailto",parse:function(e,r){var t=e,a=t.to=t.path?t.path.split(","):[];if(t.path=void 0,t.query){for(var s=!1,o={},i=t.query.split("&"),n=0,l=i.length;n<l;++n){var u=i[n].split("=");switch(u[0]){case"to":for(var c=u[1].split(","),h=0,d=c.length;h<d;++h)a.push(c[h]);break;case"subject":t.subject=O(u[1],r);break;case"body":t.body=O(u[1],r);break;default:s=!0,o[O(u[0],r)]=O(u[1],r)}}s&&(t.headers=o)}t.query=void 0;for(var f=0,p=a.length;f<p;++f){var m=a[f].split("@");if(m[0]=O(m[0]),r.unicodeSupport)m[1]=O(m[1],r).toLowerCase();else try{m[1]=v.toASCII(O(m[1],r).toLowerCase())}catch(e){t.error=t.error||"Email address's domain name can not be converted to ASCII via punycode: "+e}a[f]=m.join("@")}return t},serialize:function(e,r){var t,a=e,s=null!=(t=e.to)?t instanceof Array?t:"number"!=typeof t.length||t.split||t.setInterval||t.call?[t]:Array.prototype.slice.call(t):[];if(s){for(var o=0,i=s.length;o<i;++o){var n=String(s[o]),l=n.lastIndexOf("@"),u=n.slice(0,l).replace(G,ee).replace(G,p).replace(Y,m),c=n.slice(l+1);try{c=r.iri?v.toUnicode(c):v.toASCII(O(c,r).toLowerCase())}catch(e){a.error=a.error||"Email address's domain name can not be converted to "+(r.iri?"Unicode":"ASCII")+" via punycode: "+e}s[o]=u+"@"+c}a.path=s.join(",")}var h=e.headers=e.headers||{};e.subject&&(h.subject=e.subject),e.body&&(h.body=e.body);var d=[];for(var f in h)h[f]!==H[f]&&d.push(f.replace(G,ee).replace(G,p).replace(W,m)+"="+h[f].replace(G,ee).replace(G,p).replace(X,m));return d.length&&(a.query=d.join("&")),a}},te=/^([^\:]+)\:(.*)/,ae={scheme:"urn",parse:function(e,r){var t=e.path&&e.path.match(te),a=e;if(t){var s=r.scheme||a.scheme||"urn",o=t[1].toLowerCase(),i=t[2],n=d[s+":"+(r.nid||o)];a.nid=o,a.nss=i,a.path=void 0,n&&(a=n.parse(a,r))}else a.error=a.error||"URN can not be parsed.";return a},serialize:function(e,r){var t=e.nid,a=d[(r.scheme||e.scheme||"urn")+":"+(r.nid||t)];a&&(e=a.serialize(e,r));var s=e;return s.path=(t||r.nid)+":"+e.nss,s}},se=/^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/,oe={scheme:"urn:uuid",parse:function(e,r){var t=e;return t.uuid=t.nss,t.nss=void 0,r.tolerant||t.uuid&&t.uuid.match(se)||(t.error=t.error||"UUID is not valid."),t},serialize:function(e,r){var t=e;return t.nss=(e.uuid||"").toLowerCase(),t}};d[Q.scheme]=Q,d[V.scheme]=V,d[re.scheme]=re,d[ae.scheme]=ae,d[oe.scheme]=oe,e.SCHEMES=d,e.pctEncChar=m,e.pctDecChars=f,e.parse=_,e.removeDotSegments=D,e.serialize=j,e.resolveComponents=I,e.resolve=function(e,r,t){var a=function(e,r){var t=e;if(r)for(var a in r)t[a]=r[a];return t}({scheme:"null"},t);return j(I(_(e,a),_(r,a),a,!0),a)},e.normalize=function(e,r){return"string"==typeof e?e=j(_(e,r),r):"object"===a(e)&&(e=_(j(e,r),r)),e},e.equal=function(e,r,t){return"string"==typeof e?e=j(_(e,t),t):"object"===a(e)&&(e=j(e,t)),"string"==typeof r?r=j(_(r,t),t):"object"===a(r)&&(r=j(r,t)),e===r},e.escapeComponent=function(e,r){return e&&e.toString().replace(r&&r.iri?h.ESCAPE:c.ESCAPE,m)},e.unescapeComponent=O,Object.defineProperty(e,"__esModule",{value:!0})}("object"==typeof t&&void 0!==r?t:a.URI=a.URI||{})},{}],ajv:[function(a,e,r){"use strict";var n=a("./compile"),d=a("./compile/resolve"),t=a("./cache"),f=a("./compile/schema_obj"),s=a("fast-json-stable-stringify"),o=a("./compile/formats"),i=a("./compile/rules"),l=a("./data"),u=a("./compile/util");(e.exports=g).prototype.validate=function(e,r){var t;if("string"==typeof e){if(!(t=this.getSchema(e)))throw new Error('no schema with key or ref "'+e+'"')}else{var a=this._addSchema(e);t=a.validate||this._compile(a)}var s=t(r);!0!==t.$async&&(this.errors=t.errors);return s},g.prototype.compile=function(e,r){var t=this._addSchema(e,void 0,r);return t.validate||this._compile(t)},g.prototype.addSchema=function(e,r,t,a){if(Array.isArray(e)){for(var s=0;s<e.length;s++)this.addSchema(e[s],void 0,t,a);return this}var o=this._getId(e);if(void 0!==o&&"string"!=typeof o)throw new Error("schema id must be string");return b(this,r=d.normalizeId(r||o)),this._schemas[r]=this._addSchema(e,t,a,!0),this},g.prototype.addMetaSchema=function(e,r,t){return this.addSchema(e,r,t,!0),this},g.prototype.validateSchema=function(e,r){var t=e.$schema;if(void 0!==t&&"string"!=typeof t)throw new Error("$schema must be a string");if(!(t=t||this._opts.defaultMeta||(a=this,s=a._opts.meta,a._opts.defaultMeta="object"==typeof s?a._getId(s)||s:a.getSchema(p)?p:void 0,a._opts.defaultMeta)))return this.logger.warn("meta-schema not available"),!(this.errors=null);var a,s;var o,i=this._formats.uri;this._formats.uri="function"==typeof i?this._schemaUriFormatFunc:this._schemaUriFormat;try{o=this.validate(t,e)}finally{this._formats.uri=i}if(!o&&r){var n="schema is invalid: "+this.errorsText();if("log"!=this._opts.validateSchema)throw new Error(n);this.logger.error(n)}return o},g.prototype.getSchema=function(e){var r=y(this,e);switch(typeof r){case"object":return r.validate||this._compile(r);case"string":return this.getSchema(r);case"undefined":return function(e,r){var t=d.schema.call(e,{schema:{}},r);if(t){var a=t.schema,s=t.root,o=t.baseId,i=n.call(e,a,s,void 0,o);return e._fragments[r]=new f({ref:r,fragment:!0,schema:a,root:s,baseId:o,validate:i}),i}}(this,e)}},g.prototype.removeSchema=function(e){if(e instanceof RegExp)return P(this,this._schemas,e),P(this,this._refs,e),this;switch(typeof e){case"undefined":return P(this,this._schemas),P(this,this._refs),this._cache.clear(),this;case"string":var r=y(this,e);return r&&this._cache.del(r.cacheKey),delete this._schemas[e],delete this._refs[e],this;case"object":var t=this._opts.serialize,a=t?t(e):e;this._cache.del(a);var s=this._getId(e);s&&(s=d.normalizeId(s),delete this._schemas[s],delete this._refs[s])}return this},g.prototype.addFormat=function(e,r){"string"==typeof r&&(r=new RegExp(r));return this._formats[e]=r,this},g.prototype.errorsText=function(e,r){if(!(e=e||this.errors))return"No errors";for(var t=void 0===(r=r||{}).separator?", ":r.separator,a=void 0===r.dataVar?"data":r.dataVar,s="",o=0;o<e.length;o++){var i=e[o];i&&(s+=a+i.dataPath+" "+i.message+t)}return s.slice(0,-t.length)},g.prototype._addSchema=function(e,r,t,a){if("object"!=typeof e&&"boolean"!=typeof e)throw new Error("schema should be object or boolean");var s=this._opts.serialize,o=s?s(e):e,i=this._cache.get(o);if(i)return i;a=a||!1!==this._opts.addUsedSchema;var n=d.normalizeId(this._getId(e));n&&a&&b(this,n);var l,u=!1!==this._opts.validateSchema&&!r;u&&!(l=n&&n==d.normalizeId(e.$schema))&&this.validateSchema(e,!0);var c=d.ids.call(this,e),h=new f({id:n,schema:e,localRefs:c,cacheKey:o,meta:t});"#"!=n[0]&&a&&(this._refs[n]=h);this._cache.put(o,h),u&&l&&this.validateSchema(e,!0);return h},g.prototype._compile=function(t,e){if(t.compiling)return(t.validate=s).schema=t.schema,s.errors=null,s.root=e||s,!0===t.schema.$async&&(s.$async=!0),s;var r,a;t.compiling=!0,t.meta&&(r=this._opts,this._opts=this._metaOpts);try{a=n.call(this,t.schema,e,t.localRefs)}finally{t.compiling=!1,t.meta&&(this._opts=r)}return t.validate=a,t.refs=a.refs,t.refVal=a.refVal,t.root=a.root,a;function s(){var e=t.validate,r=e.apply(this,arguments);return s.errors=e.errors,r}},g.prototype.compileAsync=a("./compile/async");var c=a("./keyword");g.prototype.addKeyword=c.add,g.prototype.getKeyword=c.get,g.prototype.removeKeyword=c.remove;var h=a("./compile/error_classes");g.ValidationError=h.Validation,g.MissingRefError=h.MissingRef,g.$dataMetaSchema=l;var p="http://json-schema.org/draft-07/schema",m=["removeAdditional","useDefaults","coerceTypes"],v=["/properties"];function g(e){if(!(this instanceof g))return new g(e);e=this._opts=u.copy(e)||{},function(e){var r=e._opts.logger;if(!1===r)e.logger={log:_,warn:_,error:_};else{if(void 0===r&&(r=console),!("object"==typeof r&&r.log&&r.warn&&r.error))throw new Error("logger must implement log, warn and error methods");e.logger=r}}(this),this._schemas={},this._refs={},this._fragments={},this._formats=o(e.format);var r=this._schemaUriFormat=this._formats["uri-reference"];this._schemaUriFormatFunc=function(e){return r.test(e)},this._cache=e.cache||new t,this._loadingSchemas={},this._compilations=[],this.RULES=i(),this._getId=function(e){switch(e.schemaId){case"auto":return S;case"id":return E;default:return w}}(e),e.loopRequired=e.loopRequired||1/0,"property"==e.errorDataPath&&(e._errorDataPathProperty=!0),void 0===e.serialize&&(e.serialize=s),this._metaOpts=function(e){for(var r=u.copy(e._opts),t=0;t<m.length;t++)delete r[m[t]];return r}(this),e.formats&&function(e){for(var r in e._opts.formats){var t=e._opts.formats[r];e.addFormat(r,t)}}(this),function(e){var r;e._opts.$data&&(r=a("./refs/data.json"),e.addMetaSchema(r,r.$id,!0));if(!1===e._opts.meta)return;var t=a("./refs/json-schema-draft-07.json");e._opts.$data&&(t=l(t,v));e.addMetaSchema(t,p,!0),e._refs["http://json-schema.org/schema"]=p}(this),"object"==typeof e.meta&&this.addMetaSchema(e.meta),function(e){var r=e._opts.schemas;if(!r)return;if(Array.isArray(r))e.addSchema(r);else for(var t in r)e.addSchema(r[t],t)}(this)}function y(e,r){return r=d.normalizeId(r),e._schemas[r]||e._refs[r]||e._fragments[r]}function P(e,r,t){for(var a in r){var s=r[a];s.meta||t&&!t.test(a)||(e._cache.del(s.cacheKey),delete r[a])}}function E(e){return e.$id&&this.logger.warn("schema $id ignored",e.$id),e.id}function w(e){return e.id&&this.logger.warn("schema id ignored",e.id),e.$id}function S(e){if(e.$id&&e.id&&e.$id!=e.id)throw new Error("schema $id is different from id");return e.$id||e.id}function b(e,r){if(e._schemas[r]||e._refs[r])throw new Error('schema with key or id "'+r+'" already exists')}function _(){}},{"./cache":1,"./compile":5,"./compile/async":2,"./compile/error_classes":3,"./compile/formats":4,"./compile/resolve":6,"./compile/rules":7,"./compile/schema_obj":8,"./compile/util":10,"./data":11,"./keyword":38,"./refs/data.json":39,"./refs/json-schema-draft-07.json":40,"fast-json-stable-stringify":42}]},{},[])("ajv")});
+//# sourceMappingURL=ajv.min.js.map
+var telemetrySchema = [{"$id":"http://api.ekstep.org/telemetry/actor","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/actor/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/actor/type","type":"string"}},"required":["type","id"]},{"$id":"http://api.ekstep.org/telemetry/assess","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["ASSESS"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["item","pass","score","resvalues","duration"],"properties":{"item":{"$ref":"http://api.ekstep.org/telemetry/question"},"index":{"$id":"http://api.ekstep.org/telemetry/edata/index","type":"number"},"pass":{"$id":"http://api.ekstep.org/telemetry/edata/pass","type":"string"},"score":{"$id":"http://api.ekstep.org/telemetry/edata/score","type":"number"},"resvalues":{"$id":"http://api.ekstep.org/telemetry/edata/resvalues","type":"array","items":{"type":"object"}},"duration":{"$id":"http://api.ekstep.org/telemetry/edata/duration","type":"number"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/audit","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["AUDIT"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"properties":{"props":{"$id":"http://api.ekstep.org/telemetry/edata/props","type":"array","items":{"type":"string"}},"state":{"$id":"http://api.ekstep.org/telemetry/edata/state","type":"string"},"prevstate":{"$id":"http://api.ekstep.org/telemetry/edata/prevstate","type":"string"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/cdata","type":"array","items":{"type":"object","properties":{"type":{"$id":"http://api.ekstep.org/telemetry/cdata/type","type":"string"},"id":{"$id":"http://api.ekstep.org/telemetry/cdata/id","type":"string"}},"additionalProperties":false,"required":["type","id"]}},{"$id":"http://api.ekstep.org/telemetry/common","type":"object","properties":{"ets":{"$id":"http://api.ekstep.org/telemetry/ets","type":"number","format":"date-time"},"ver":{"$id":"http://api.ekstep.org/telemetry/ver","type":"string","enum":["3.0"]},"mid":{"$id":"http://api.ekstep.org/telemetry/mid","type":"string","minLength":1},"actor":{"$ref":"http://api.ekstep.org/telemetry/actor"},"context":{"$ref":"http://api.ekstep.org/telemetry/context"},"object":{"$ref":"http://api.ekstep.org/telemetry/object"},"tags":{"type":"array","items":{"type":"string"}}}},{"$id":"http://api.ekstep.org/telemetry/context","type":"object","properties":{"channel":{"$id":"http://api.ekstep.org/telemetry/context/channel","type":"string","minLength":1},"pdata":{"$ref":"http://api.ekstep.org/telemetry/pdata"},"env":{"$id":"http://api.ekstep.org/telemetry/context/env","type":"string"},"sid":{"$id":"http://api.ekstep.org/telemetry/context/sid","type":"string"},"did":{"$id":"http://api.ekstep.org/telemetry/context/did","type":"string"},"cdata":{"$ref":"http://api.ekstep.org/telemetry/cdata"}},"required":["channel","env","pdata"]},{"$id":"http://api.ekstep.org/telemetry/dspec","type":"object","properties":{"os":{"$id":"http://api.ekstep.org/telemetry/dspec/os","type":"string"},"make":{"$id":"http://api.ekstep.org/telemetry/dspec/make","type":"string"},"id":{"$id":"http://api.ekstep.org/telemetry/dspec/id","type":"string"},"mem":{"$id":"http://api.ekstep.org/telemetry/dspec/mem","type":"number","minimum":-1},"idisk":{"$id":"http://api.ekstep.org/telemetry/dspec/idisk","type":"number","minimum":-1},"edisk":{"$id":"http://api.ekstep.org/telemetry/dspec/edisk","type":"number","minimum":-1},"scrn":{"$id":"http://api.ekstep.org/telemetry/dspec/scrn","type":"number","minimum":-1},"camera":{"$id":"http://api.ekstep.org/telemetry/dspec/camera","type":"string"},"cpu":{"$id":"http://api.ekstep.org/telemetry/dspec/cpu","type":"string"},"sims":{"$id":"http://api.ekstep.org/telemetry/dspec/sims","type":"number","minimum":-1},"cap":{"$id":"http://api.ekstep.org/telemetry/dspec/cap","type":"array","items":{"type":"string"}}}},{"$id":"http://api.ekstep.org/telemetry/end","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["END"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"mode":{"$id":"http://api.ekstep.org/telemetry/edata/mode","type":"string"},"duration":{"$id":"http://api.ekstep.org/telemetry/edata/duration","type":"number"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"},"summary":{"$id":"http://api.ekstep.org/telemetry/edata/summary","type":"array","items":{"type":"object"}}}}}}]},{"$id":"http://api.ekstep.org/telemetry/error","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["ERROR"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["err","errtype","stacktrace"],"properties":{"err":{"$id":"http://api.ekstep.org/telemetry/edata/err","type":"string"},"errtype":{"$id":"http://api.ekstep.org/telemetry/edata/errtype","type":"string"},"stacktrace":{"$id":"http://api.ekstep.org/telemetry/edata/stacktrace","type":"string"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"},"object":{"$ref":"http://api.ekstep.org/telemetry/inlineobject"},"plugin":{"$ref":"http://api.ekstep.org/telemetry/plugin"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/exdata","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["EXDATA"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"data":{"$id":"http://api.ekstep.org/telemetry/edata/data","type":"string"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/feedback","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["FEEDBACK"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"properties":{"rating":{"$id":"http://api.ekstep.org/telemetry/edata/rating","type":"number"},"comments":{"$id":"http://api.ekstep.org/telemetry/edata/comments","type":"string"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/heartbeat","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["HEARTBEAT"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object"}}}]},{"$id":"http://api.ekstep.org/telemetry/impression","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["IMPRESSION"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type","pageid","uri"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"subtype":{"$id":"http://api.ekstep.org/telemetry/edata/subtype","type":"string"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"},"uri":{"$id":"http://api.ekstep.org/telemetry/edata/uri","type":"string"},"duration":{"$id":"http://api.ekstep.org/telemetry/edata/duration","type":"number"},"visits":{"$id":"http://api.ekstep.org/telemetry/edata/visits","type":"array","items":{"type":"object","properties":{"objid":{"$id":"http://api.ekstep.org/telemetry/edata/visits/objid","type":"string"},"objtype":{"$id":"http://api.ekstep.org/telemetry/edata/visits/objtype","type":"string"},"objver":{"$id":"http://api.ekstep.org/telemetry/edata/visits/objver","type":"string"},"section":{"$id":"http://api.ekstep.org/telemetry/edata/visits/section","type":"string"},"index":{"$id":"http://api.ekstep.org/telemetry/edata/visits/index","type":"number"}},"additionalProperties":false,"required":["objid","objtype"]}}}}}}]},{"$id":"http://api.ekstep.org/telemetry/inlineobject","type":"object","additionalProperties":false,"required":["id","type","ver"],"properties":{"id":{"$id":"http://api.ekstep.org/telemetry/inlineobject/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/inlineobject/type","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/inlineobject/ver","type":"string"},"subtype":{"$id":"http://api.ekstep.org/telemetry/inlineobject/subtype","type":"string"},"name":{"$id":"http://api.ekstep.org/telemetry/inlineobject/name","type":"string"},"code":{"$id":"http://api.ekstep.org/telemetry/inlineobject/code","type":"string"},"parent":{"$ref":"http://api.ekstep.org/telemetry/parent"}}},{"$id":"http://api.ekstep.org/telemetry/interact","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["INTERACT"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type","id"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"subtype":{"$id":"http://api.ekstep.org/telemetry/edata/subtype","type":"string"},"id":{"$id":"http://api.ekstep.org/telemetry/edata/id","type":"string"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"},"duration":{"$id":"http://api.ekstep.org/telemetry/edata/duration","type":"number"},"target":{"$ref":"http://api.ekstep.org/telemetry/target"},"plugin":{"$ref":"http://api.ekstep.org/telemetry/plugin"},"extra":{"$id":"http://api.ekstep.org/telemetry/edata/extra","type":"object"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/interrupt","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["INTERRUPT"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/items","type":"array","items":{"type":"object","additionalProperties":false,"properties":{"id":{"$id":"http://api.ekstep.org/telemetry/items/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/items/type","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/items/ver","type":"string"},"params":{"$id":"http://api.ekstep.org/telemetry/items/params","type":"array","items":{"type":"object"}},"origin":{"$id":"http://api.ekstep.org/telemetry/items/origin","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/items/origin/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/items/origin/type","type":"string"}}},"to":{"$id":"http://api.ekstep.org/telemetry/items/to","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/items/to/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/items/to/type","type":"string"}}}}}},{"$id":"http://api.ekstep.org/telemetry/log","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["LOG"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type","level","message"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"level":{"$id":"http://api.ekstep.org/telemetry/edata/level","type":"string"},"message":{"$id":"http://api.ekstep.org/telemetry/edata/message","type":"string"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"},"params":{"$id":"http://api.ekstep.org/telemetry/edata/params","type":"array","items":{"type":"object"}}}}}}]},{"$id":"http://api.ekstep.org/telemetry/object","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/object/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/object/type","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/object/ver","type":"string"},"rollup":{"$ref":"http://api.ekstep.org/telemetry/rollup"}}},{"$id":"http://api.ekstep.org/telemetry/parent","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/parent/id","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/parent/type","type":"string"}}},{"$id":"http://api.ekstep.org/telemetry/pdata","type":"object","properties":{"id":{"$id":"http://api.ekstep.org/telemetry/pdata/id","type":"string"},"pid":{"$id":"http://api.ekstep.org/telemetry/pdata/pid","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/pdata/ver","type":"string"}},"required":["id"]},{"$id":"http://api.ekstep.org/telemetry/plugin","type":"object","additionalProperties":false,"required":["id","ver"],"properties":{"id":{"$id":"http://api.ekstep.org/telemetry/plugin/id","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/plugin/ver","type":"string"},"category":{"$id":"http://api.ekstep.org/telemetry/plugin/category","type":"string"}}},{"$id":"http://api.ekstep.org/telemetry/question","type":"object","additionalProperties":false,"required":["id"],"properties":{"id":{"$id":"http://api.ekstep.org/telemetry/question/id","type":"string"},"maxscore":{"$id":"http://api.ekstep.org/telemetry/question/maxscore","type":"number"},"exlength":{"$id":"http://api.ekstep.org/telemetry/question/exlength","type":"number"},"params":{"$id":"http://api.ekstep.org/telemetry/question/params","type":"array","items":{"type":"object"}},"uri":{"$id":"http://api.ekstep.org/telemetry/question/uri","type":"string"},"desc":{"$id":"http://api.ekstep.org/telemetry/question/desc","type":"string"},"title":{"$id":"http://api.ekstep.org/telemetry/question/title","type":"string"},"mmc":{"$id":"http://api.ekstep.org/telemetry/question/mmc","type":"array","items":{"type":"string"}},"mc":{"$id":"http://api.ekstep.org/telemetry/question/mc","type":"array","items":{"type":"string"}}}},{"$id":"http://api.ekstep.org/telemetry/response","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["RESPONSE"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["target","type","values"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/type","type":"string"},"target":{"$ref":"http://api.ekstep.org/telemetry/target"},"values":{"type":"array","items":{"type":"object"}}}}}}]},{"$id":"http://api.ekstep.org/telemetry/rollup","type":"object","properties":{"l1":{"$id":"http://api.ekstep.org/telemetry/context/rollup/l1","type":"string"},"l2":{"$id":"http://api.ekstep.org/telemetry/context/rollup/l2","type":"string"},"l3":{"$id":"http://api.ekstep.org/telemetry/context/rollup/l3","type":"string"},"l4":{"$id":"http://api.ekstep.org/telemetry/context/rollup/l4","type":"string"}}},{"$id":"http://api.ekstep.org/telemetry/search","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["SEARCH"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["query","size","topn"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"query":{"$id":"http://api.ekstep.org/telemetry/edata/query","type":"string"},"filters":{"$id":"http://api.ekstep.org/telemetry/edata/filters","type":"object"},"sort":{"$id":"http://api.ekstep.org/telemetry/edata/sort","type":"object"},"correlationid":{"$id":"http://api.ekstep.org/telemetry/edata/correlationid","type":"string"},"size":{"$id":"http://api.ekstep.org/telemetry/edata/size","type":"number"},"topn":{"$id":"http://api.ekstep.org/telemetry/edata/topn","type":"array","items":{"type":"object"}}}}}}]},{"$id":"http://api.ekstep.org/telemetry/share","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["SHARE"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["items"],"properties":{"dir":{"$id":"http://api.ekstep.org/telemetry/edata/dir","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"items":{"$ref":"http://api.ekstep.org/telemetry/items"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/start","type":"object","required":["eid","ets","ver","mid","actor","context","edata"],"allOf":[{"$ref":"http://api.ekstep.org/telemetry/common"},{"properties":{"eid":{"$id":"http://api.ekstep.org/telemetry/eid","enum":["START"]},"edata":{"$id":"http://api.ekstep.org/telemetry/edata","type":"object","additionalProperties":false,"required":["type"],"properties":{"type":{"$id":"http://api.ekstep.org/telemetry/edata/type","type":"string"},"dspec":{"$ref":"http://api.ekstep.org/telemetry/dspec"},"uaspec":{"$ref":"http://api.ekstep.org/telemetry/uaspec"},"loc":{"$id":"http://api.ekstep.org/telemetry/edata/loc","type":"string"},"mode":{"$id":"http://api.ekstep.org/telemetry/edata/mode","type":"string"},"duration":{"$id":"http://api.ekstep.org/telemetry/edata/duration","type":"number"},"pageid":{"$id":"http://api.ekstep.org/telemetry/edata/pageid","type":"string"}}}}}]},{"$id":"http://api.ekstep.org/telemetry/target","type":"object","additionalProperties":false,"required":["id","ver","type"],"properties":{"id":{"$id":"http://api.ekstep.org/telemetry/target/id","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/target/ver","type":"string"},"type":{"$id":"http://api.ekstep.org/telemetry/target/type","type":"string"},"parent":{"$ref":"http://api.ekstep.org/telemetry/parent"}}},{"$id":"http://api.ekstep.org/telemetry/uaspec","type":"object","properties":{"agent":{"$id":"http://api.ekstep.org/telemetry/uaspec/agent","type":"string"},"ver":{"$id":"http://api.ekstep.org/telemetry/uaspec/ver","type":"string"},"system":{"$id":"http://api.ekstep.org/telemetry/uaspec/system","type":"string"},"platform":{"$id":"http://api.ekstep.org/telemetry/uaspec/platform","type":"string"},"raw":{"$id":"http://api.ekstep.org/telemetry/uaspec/raw","type":"string"}}}]
+/**
+ * @author Krushanu Mohapatra<Krushanu.Mohapatra@tarento.com>
+ */
+
+ /****************************************
+* UUID Library for Device ID generation *
+*****************************************/
+
+!function (e) { if ("object" == typeof exports && "undefined" != typeof module) module.exports = e(); else if ("function" == typeof define && define.amd) define([], e); else { var r; r = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : this, r.uuidv1 = e() } }(function () { return function e(r, n, o) { function t(u, f) { if (!n[u]) { if (!r[u]) { var s = "function" == typeof require && require; if (!f && s) return s(u, !0); if (i) return i(u, !0); var d = new Error("Cannot find module '" + u + "'"); throw d.code = "MODULE_NOT_FOUND", d } var a = n[u] = { exports: {} }; r[u][0].call(a.exports, function (e) { var n = r[u][1][e]; return t(n ? n : e) }, a, a.exports, e, r, n, o) } return n[u].exports } for (var i = "function" == typeof require && require, u = 0; u < o.length; u++)t(o[u]); return t }({ 1: [function (e, r, n) { function o(e, r) { var n = r || 0, o = t; return o[e[n++]] + o[e[n++]] + o[e[n++]] + o[e[n++]] + "-" + o[e[n++]] + o[e[n++]] + "-" + o[e[n++]] + o[e[n++]] + "-" + o[e[n++]] + o[e[n++]] + "-" + o[e[n++]] + o[e[n++]] + o[e[n++]] + o[e[n++]] + o[e[n++]] + o[e[n++]] } for (var t = [], i = 0; i < 256; ++i)t[i] = (i + 256).toString(16).substr(1); r.exports = o }, {}], 2: [function (e, r, n) { var o = "undefined" != typeof crypto && crypto.getRandomValues.bind(crypto) || "undefined" != typeof msCrypto && msCrypto.getRandomValues.bind(msCrypto); if (o) { var t = new Uint8Array(16); r.exports = function () { return o(t), t } } else { var i = new Array(16); r.exports = function () { for (var e, r = 0; r < 16; r++)0 === (3 & r) && (e = 4294967296 * Math.random()), i[r] = e >>> ((3 & r) << 3) & 255; return i } } }, {}], 3: [function (e, r, n) { function o(e, r, n) { var o = r && n || 0, a = r || []; e = e || {}; var c = e.node || t, l = void 0 !== e.clockseq ? e.clockseq : i; if (null == c || null == l) { var v = u(); null == c && (c = t = [1 | v[0], v[1], v[2], v[3], v[4], v[5]]), null == l && (l = i = 16383 & (v[6] << 8 | v[7])) } var p = void 0 !== e.msecs ? e.msecs : (new Date).getTime(), y = void 0 !== e.nsecs ? e.nsecs : d + 1, m = p - s + (y - d) / 1e4; if (m < 0 && void 0 === e.clockseq && (l = l + 1 & 16383), (m < 0 || p > s) && void 0 === e.nsecs && (y = 0), y >= 1e4) throw new Error("uuid.v1(): Can't create more than 10M uuids/sec"); s = p, d = y, i = l, p += 122192928e5; var b = (1e4 * (268435455 & p) + y) % 4294967296; a[o++] = b >>> 24 & 255, a[o++] = b >>> 16 & 255, a[o++] = b >>> 8 & 255, a[o++] = 255 & b; var w = p / 4294967296 * 1e4 & 268435455; a[o++] = w >>> 8 & 255, a[o++] = 255 & w, a[o++] = w >>> 24 & 15 | 16, a[o++] = w >>> 16 & 255, a[o++] = l >>> 8 | 128, a[o++] = 255 & l; for (var x = 0; x < 6; ++x)a[o + x] = c[x]; return r ? r : f(a) } var t, i, u = e("./lib/rng"), f = e("./lib/bytesToUuid"), s = 0, d = 0; r.exports = o }, { "./lib/bytesToUuid": 1, "./lib/rng": 2 }] }, {}, [3])(3) });
+
+
+
+var detectClient = function() {
+
+        var nAgt = navigator.userAgent;
+        var browserName = navigator.appName;
+        var fullVersion = '' + parseFloat(navigator.appVersion);
+        var nameOffset, verOffset, ix;
+
+        // In Opera
+        /* istanbul ignore next. Cannot test this as the test cases runs in phatomjs browser */
+        if ((verOffset = nAgt.indexOf("Opera")) != -1) {
+            browserName = "opera";
+            fullVersion = nAgt.substring(verOffset + 6);
+            if ((verOffset = nAgt.indexOf("Version")) != -1)
+                fullVersion = nAgt.substring(verOffset + 8);
+        }
+        // In MSIE
+        else if ((verOffset = nAgt.indexOf("MSIE")) != -1) {
+            browserName = "IE";
+            fullVersion = nAgt.substring(verOffset + 5);
+        }
+        // In Chrome
+        else if ((verOffset = nAgt.indexOf("Chrome")) != -1) {
+            browserName = "chrome";
+            fullVersion = nAgt.substring(verOffset + 7);
+        }
+        // In Safari
+        else if ((verOffset = nAgt.indexOf("Safari")) != -1) {
+            browserName = "safari";
+            fullVersion = nAgt.substring(verOffset + 7);
+            if ((verOffset = nAgt.indexOf("Version")) != -1)
+                fullVersion = nAgt.substring(verOffset + 8);
+        }
+        // In Firefox
+        else if ((verOffset = nAgt.indexOf("Firefox")) != -1) {
+            browserName = "firefox";
+            fullVersion = nAgt.substring(verOffset + 8);
+        }
+
+        // trim the fullVersion string at semicolon/space if present
+        /* istanbul ignore next. Cannot test this as the test cases runs in phatomjs browser */
+        if ((ix = fullVersion.indexOf(";")) != -1)
+            fullVersion = fullVersion.substring(0, ix);
+        /* istanbul ignore next. Cannot test this as the test cases runs in phatomjs browser */
+        if ((ix = fullVersion.indexOf(" ")) != -1)
+            fullVersion = fullVersion.substring(0, ix);
+
+        return { browser: browserName, browserver: fullVersion, os: navigator.platform };
+    }
+
+/*
+CryptoJS v3.1.2
+code.google.com/p/crypto-js
+(c) 2009-2013 by Jeff Mott. All rights reserved.
+code.google.com/p/crypto-js/wiki/License
+*/
+var CryptoJS = CryptoJS || function(s, p) {
+    var m = {},
+        l = m.lib = {},
+        n = function() {},
+        r = l.Base = {
+            extend: function(b) {
+                n.prototype = this;
+                var h = new n;
+                b && h.mixIn(b);
+                h.hasOwnProperty("init") || (h.init = function() {
+                    h.$super.init.apply(this, arguments)
+                });
+                h.init.prototype = h;
+                h.$super = this;
+                return h
+            },
+            create: function() {
+                var b = this.extend();
+                b.init.apply(b, arguments);
+                return b
+            },
+            init: function() {},
+            mixIn: function(b) {
+                for (var h in b) b.hasOwnProperty(h) && (this[h] = b[h]);
+                b.hasOwnProperty("toString") && (this.toString = b.toString)
+            },
+            clone: function() {
+                return this.init.prototype.extend(this)
+            }
+        },
+        q = l.WordArray = r.extend({
+            init: function(b, h) {
+                b = this.words = b || [];
+                this.sigBytes = h != p ? h : 4 * b.length
+            },
+            toString: function(b) {
+                return (b || t).stringify(this)
+            },
+            concat: function(b) {
+                var h = this.words,
+                    a = b.words,
+                    j = this.sigBytes;
+                b = b.sigBytes;
+                this.clamp();
+                if (j % 4)
+                    for (var g = 0; g < b; g++) h[j + g >>> 2] |= (a[g >>> 2] >>> 24 - 8 * (g % 4) & 255) << 24 - 8 * ((j + g) % 4);
+                else if (65535 < a.length)
+                    for (g = 0; g < b; g += 4) h[j + g >>> 2] = a[g >>> 2];
+                else h.push.apply(h, a);
+                this.sigBytes += b;
+                return this
+            },
+            clamp: function() {
+                var b = this.words,
+                    h = this.sigBytes;
+                b[h >>> 2] &= 4294967295 <<
+                    32 - 8 * (h % 4);
+                b.length = s.ceil(h / 4)
+            },
+            clone: function() {
+                var b = r.clone.call(this);
+                b.words = this.words.slice(0);
+                return b
+            },
+            random: function(b) {
+                for (var h = [], a = 0; a < b; a += 4) h.push(4294967296 * s.random() | 0);
+                return new q.init(h, b)
+            }
+        }),
+        v = m.enc = {},
+        t = v.Hex = {
+            stringify: function(b) {
+                var a = b.words;
+                b = b.sigBytes;
+                for (var g = [], j = 0; j < b; j++) {
+                    var k = a[j >>> 2] >>> 24 - 8 * (j % 4) & 255;
+                    g.push((k >>> 4).toString(16));
+                    g.push((k & 15).toString(16))
+                }
+                return g.join("")
+            },
+            parse: function(b) {
+                for (var a = b.length, g = [], j = 0; j < a; j += 2) g[j >>> 3] |= parseInt(b.substr(j,
+                    2), 16) << 24 - 4 * (j % 8);
+                return new q.init(g, a / 2)
+            }
+        },
+        a = v.Latin1 = {
+            stringify: function(b) {
+                var a = b.words;
+                b = b.sigBytes;
+                for (var g = [], j = 0; j < b; j++) g.push(String.fromCharCode(a[j >>> 2] >>> 24 - 8 * (j % 4) & 255));
+                return g.join("")
+            },
+            parse: function(b) {
+                for (var a = b.length, g = [], j = 0; j < a; j++) g[j >>> 2] |= (b.charCodeAt(j) & 255) << 24 - 8 * (j % 4);
+                return new q.init(g, a)
+            }
+        },
+        u = v.Utf8 = {
+            stringify: function(b) {
+                try {
+                    return decodeURIComponent(escape(a.stringify(b)))
+                } catch (g) {
+                    throw Error("Malformed UTF-8 data");
+                }
+            },
+            parse: function(b) {
+                return a.parse(unescape(encodeURIComponent(b)))
+            }
+        },
+        g = l.BufferedBlockAlgorithm = r.extend({
+            reset: function() {
+                this._data = new q.init;
+                this._nDataBytes = 0
+            },
+            _append: function(b) {
+                "string" == typeof b && (b = u.parse(b));
+                this._data.concat(b);
+                this._nDataBytes += b.sigBytes
+            },
+            _process: function(b) {
+                var a = this._data,
+                    g = a.words,
+                    j = a.sigBytes,
+                    k = this.blockSize,
+                    m = j / (4 * k),
+                    m = b ? s.ceil(m) : s.max((m | 0) - this._minBufferSize, 0);
+                b = m * k;
+                j = s.min(4 * b, j);
+                if (b) {
+                    for (var l = 0; l < b; l += k) this._doProcessBlock(g, l);
+                    l = g.splice(0, b);
+                    a.sigBytes -= j
+                }
+                return new q.init(l, j)
+            },
+            clone: function() {
+                var b = r.clone.call(this);
+                b._data = this._data.clone();
+                return b
+            },
+            _minBufferSize: 0
+        });
+    l.Hasher = g.extend({
+        cfg: r.extend(),
+        init: function(b) {
+            this.cfg = this.cfg.extend(b);
+            this.reset()
+        },
+        reset: function() {
+            g.reset.call(this);
+            this._doReset()
+        },
+        update: function(b) {
+            this._append(b);
+            this._process();
+            return this
+        },
+        finalize: function(b) {
+            b && this._append(b);
+            return this._doFinalize()
+        },
+        blockSize: 16,
+        _createHelper: function(b) {
+            return function(a, g) {
+                return (new b.init(g)).finalize(a)
+            }
+        },
+        _createHmacHelper: function(b) {
+            return function(a, g) {
+                return (new k.HMAC.init(b,
+                    g)).finalize(a)
+            }
+        }
+    });
+    var k = m.algo = {};
+    return m
+}(Math);
+(function(s) {
+    function p(a, k, b, h, l, j, m) {
+        a = a + (k & b | ~k & h) + l + m;
+        return (a << j | a >>> 32 - j) + k
+    }
+
+    function m(a, k, b, h, l, j, m) {
+        a = a + (k & h | b & ~h) + l + m;
+        return (a << j | a >>> 32 - j) + k
+    }
+
+    function l(a, k, b, h, l, j, m) {
+        a = a + (k ^ b ^ h) + l + m;
+        return (a << j | a >>> 32 - j) + k
+    }
+
+    function n(a, k, b, h, l, j, m) {
+        a = a + (b ^ (k | ~h)) + l + m;
+        return (a << j | a >>> 32 - j) + k
+    }
+    for (var r = CryptoJS, q = r.lib, v = q.WordArray, t = q.Hasher, q = r.algo, a = [], u = 0; 64 > u; u++) a[u] = 4294967296 * s.abs(s.sin(u + 1)) | 0;
+    q = q.MD5 = t.extend({
+        _doReset: function() {
+            this._hash = new v.init([1732584193, 4023233417, 2562383102, 271733878])
+        },
+        _doProcessBlock: function(g, k) {
+            for (var b = 0; 16 > b; b++) {
+                var h = k + b,
+                    w = g[h];
+                g[h] = (w << 8 | w >>> 24) & 16711935 | (w << 24 | w >>> 8) & 4278255360
+            }
+            var b = this._hash.words,
+                h = g[k + 0],
+                w = g[k + 1],
+                j = g[k + 2],
+                q = g[k + 3],
+                r = g[k + 4],
+                s = g[k + 5],
+                t = g[k + 6],
+                u = g[k + 7],
+                v = g[k + 8],
+                x = g[k + 9],
+                y = g[k + 10],
+                z = g[k + 11],
+                A = g[k + 12],
+                B = g[k + 13],
+                C = g[k + 14],
+                D = g[k + 15],
+                c = b[0],
+                d = b[1],
+                e = b[2],
+                f = b[3],
+                c = p(c, d, e, f, h, 7, a[0]),
+                f = p(f, c, d, e, w, 12, a[1]),
+                e = p(e, f, c, d, j, 17, a[2]),
+                d = p(d, e, f, c, q, 22, a[3]),
+                c = p(c, d, e, f, r, 7, a[4]),
+                f = p(f, c, d, e, s, 12, a[5]),
+                e = p(e, f, c, d, t, 17, a[6]),
+                d = p(d, e, f, c, u, 22, a[7]),
+                c = p(c, d, e, f, v, 7, a[8]),
+                f = p(f, c, d, e, x, 12, a[9]),
+                e = p(e, f, c, d, y, 17, a[10]),
+                d = p(d, e, f, c, z, 22, a[11]),
+                c = p(c, d, e, f, A, 7, a[12]),
+                f = p(f, c, d, e, B, 12, a[13]),
+                e = p(e, f, c, d, C, 17, a[14]),
+                d = p(d, e, f, c, D, 22, a[15]),
+                c = m(c, d, e, f, w, 5, a[16]),
+                f = m(f, c, d, e, t, 9, a[17]),
+                e = m(e, f, c, d, z, 14, a[18]),
+                d = m(d, e, f, c, h, 20, a[19]),
+                c = m(c, d, e, f, s, 5, a[20]),
+                f = m(f, c, d, e, y, 9, a[21]),
+                e = m(e, f, c, d, D, 14, a[22]),
+                d = m(d, e, f, c, r, 20, a[23]),
+                c = m(c, d, e, f, x, 5, a[24]),
+                f = m(f, c, d, e, C, 9, a[25]),
+                e = m(e, f, c, d, q, 14, a[26]),
+                d = m(d, e, f, c, v, 20, a[27]),
+                c = m(c, d, e, f, B, 5, a[28]),
+                f = m(f, c,
+                    d, e, j, 9, a[29]),
+                e = m(e, f, c, d, u, 14, a[30]),
+                d = m(d, e, f, c, A, 20, a[31]),
+                c = l(c, d, e, f, s, 4, a[32]),
+                f = l(f, c, d, e, v, 11, a[33]),
+                e = l(e, f, c, d, z, 16, a[34]),
+                d = l(d, e, f, c, C, 23, a[35]),
+                c = l(c, d, e, f, w, 4, a[36]),
+                f = l(f, c, d, e, r, 11, a[37]),
+                e = l(e, f, c, d, u, 16, a[38]),
+                d = l(d, e, f, c, y, 23, a[39]),
+                c = l(c, d, e, f, B, 4, a[40]),
+                f = l(f, c, d, e, h, 11, a[41]),
+                e = l(e, f, c, d, q, 16, a[42]),
+                d = l(d, e, f, c, t, 23, a[43]),
+                c = l(c, d, e, f, x, 4, a[44]),
+                f = l(f, c, d, e, A, 11, a[45]),
+                e = l(e, f, c, d, D, 16, a[46]),
+                d = l(d, e, f, c, j, 23, a[47]),
+                c = n(c, d, e, f, h, 6, a[48]),
+                f = n(f, c, d, e, u, 10, a[49]),
+                e = n(e, f, c, d,
+                    C, 15, a[50]),
+                d = n(d, e, f, c, s, 21, a[51]),
+                c = n(c, d, e, f, A, 6, a[52]),
+                f = n(f, c, d, e, q, 10, a[53]),
+                e = n(e, f, c, d, y, 15, a[54]),
+                d = n(d, e, f, c, w, 21, a[55]),
+                c = n(c, d, e, f, v, 6, a[56]),
+                f = n(f, c, d, e, D, 10, a[57]),
+                e = n(e, f, c, d, t, 15, a[58]),
+                d = n(d, e, f, c, B, 21, a[59]),
+                c = n(c, d, e, f, r, 6, a[60]),
+                f = n(f, c, d, e, z, 10, a[61]),
+                e = n(e, f, c, d, j, 15, a[62]),
+                d = n(d, e, f, c, x, 21, a[63]);
+            b[0] = b[0] + c | 0;
+            b[1] = b[1] + d | 0;
+            b[2] = b[2] + e | 0;
+            b[3] = b[3] + f | 0
+        },
+        _doFinalize: function() {
+            var a = this._data,
+                k = a.words,
+                b = 8 * this._nDataBytes,
+                h = 8 * a.sigBytes;
+            k[h >>> 5] |= 128 << 24 - h % 32;
+            var l = s.floor(b /
+                4294967296);
+            k[(h + 64 >>> 9 << 4) + 15] = (l << 8 | l >>> 24) & 16711935 | (l << 24 | l >>> 8) & 4278255360;
+            k[(h + 64 >>> 9 << 4) + 14] = (b << 8 | b >>> 24) & 16711935 | (b << 24 | b >>> 8) & 4278255360;
+            a.sigBytes = 4 * (k.length + 1);
+            this._process();
+            a = this._hash;
+            k = a.words;
+            for (b = 0; 4 > b; b++) h = k[b], k[b] = (h << 8 | h >>> 24) & 16711935 | (h << 24 | h >>> 8) & 4278255360;
+            return a
+        },
+        clone: function() {
+            var a = t.clone.call(this);
+            a._hash = this._hash.clone();
+            return a
+        }
+    });
+    r.MD5 = t._createHelper(q);
+    r.HmacMD5 = t._createHmacHelper(q)
+})(Math);
+!function (r, u) { "use strict"; var c = "function", i = "undefined", m = "object", s = "model", e = "name", o = "type", n = "vendor", a = "version", d = "architecture", t = "console", l = "mobile", w = "tablet", b = "smarttv", p = "wearable", g = { extend: function (i, s) { var e = {}; for (var o in i) s[o] && s[o].length % 2 == 0 ? e[o] = s[o].concat(i[o]) : e[o] = i[o]; return e }, has: function (i, s) { return "string" == typeof i && -1 !== s.toLowerCase().indexOf(i.toLowerCase()) }, lowerize: function (i) { return i.toLowerCase() }, major: function (i) { return "string" == typeof i ? i.replace(/[^\d\.]/g, "").split(".")[0] : u }, trim: function (i) { return i.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, "") } }, f = { rgx: function (i, s) { for (var e, o, r, n, a, d, t = 0; t < s.length && !a;) { var l = s[t], w = s[t + 1]; for (e = o = 0; e < l.length && !a;)if (a = l[e++].exec(i)) for (r = 0; r < w.length; r++)d = a[++o], typeof (n = w[r]) === m && 0 < n.length ? 2 == n.length ? typeof n[1] == c ? this[n[0]] = n[1].call(this, d) : this[n[0]] = n[1] : 3 == n.length ? typeof n[1] !== c || n[1].exec && n[1].test ? this[n[0]] = d ? d.replace(n[1], n[2]) : u : this[n[0]] = d ? n[1].call(this, d, n[2]) : u : 4 == n.length && (this[n[0]] = d ? n[3].call(this, d.replace(n[1], n[2])) : u) : this[n] = d || u; t += 2 } }, str: function (i, s) { for (var e in s) if (typeof s[e] === m && 0 < s[e].length) { for (var o = 0; o < s[e].length; o++)if (g.has(s[e][o], i)) return "?" === e ? u : e } else if (g.has(s[e], i)) return "?" === e ? u : e; return i } }, h = { browser: { oldsafari: { version: { "1.0": "/8", 1.2: "/1", 1.3: "/3", "2.0": "/412", "2.0.2": "/416", "2.0.3": "/417", "2.0.4": "/419", "?": "/" } } }, device: { amazon: { model: { "Fire Phone": ["SD", "KF"] } }, sprint: { model: { "Evo Shift 4G": "7373KT" }, vendor: { HTC: "APA", Sprint: "Sprint" } } }, os: { windows: { version: { ME: "4.90", "NT 3.11": "NT3.51", "NT 4.0": "NT4.0", 2e3: "NT 5.0", XP: ["NT 5.1", "NT 5.2"], Vista: "NT 6.0", 7: "NT 6.1", 8: "NT 6.2", 8.1: "NT 6.3", 10: ["NT 6.4", "NT 10.0"], RT: "ARM" } } } }, v = { browser: [[/(opera\smini)\/([\w\.-]+)/i, /(opera\s[mobiletab]+).+version\/([\w\.-]+)/i, /(opera).+version\/([\w\.]+)/i, /(opera)[\/\s]+([\w\.]+)/i], [e, a], [/(opios)[\/\s]+([\w\.]+)/i], [[e, "Opera Mini"], a], [/\s(opr)\/([\w\.]+)/i], [[e, "Opera"], a], [/(kindle)\/([\w\.]+)/i, /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?([\w\.]*)/i, /(avant\s|iemobile|slim|baidu)(?:browser)?[\/\s]?([\w\.]*)/i, /(?:ms|\()(ie)\s([\w\.]+)/i, /(rekonq)\/([\w\.]*)/i, /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark)\/([\w\.-]+)/i], [e, a], [/(trident).+rv[:\s]([\w\.]+).+like\sgecko/i], [[e, "IE"], a], [/(edge|edgios|edga)\/((\d+)?[\w\.]+)/i], [[e, "Edge"], a], [/(yabrowser)\/([\w\.]+)/i], [[e, "Yandex"], a], [/(puffin)\/([\w\.]+)/i], [[e, "Puffin"], a], [/(focus)\/([\w\.]+)/i], [[e, "Firefox Focus"], a], [/(opt)\/([\w\.]+)/i], [[e, "Opera Touch"], a], [/((?:[\s\/])uc?\s?browser|(?:juc.+)ucweb)[\/\s]?([\w\.]+)/i], [[e, "UCBrowser"], a], [/(comodo_dragon)\/([\w\.]+)/i], [[e, /_/g, " "], a], [/(micromessenger)\/([\w\.]+)/i], [[e, "WeChat"], a], [/(brave)\/([\w\.]+)/i], [[e, "Brave"], a], [/(qqbrowserlite)\/([\w\.]+)/i], [e, a], [/(QQ)\/([\d\.]+)/i], [e, a], [/m?(qqbrowser)[\/\s]?([\w\.]+)/i], [e, a], [/(BIDUBrowser)[\/\s]?([\w\.]+)/i], [e, a], [/(2345Explorer)[\/\s]?([\w\.]+)/i], [e, a], [/(MetaSr)[\/\s]?([\w\.]+)/i], [e], [/(LBBROWSER)/i], [e], [/xiaomi\/miuibrowser\/([\w\.]+)/i], [a, [e, "MIUI Browser"]], [/;fbav\/([\w\.]+);/i], [a, [e, "Facebook"]], [/safari\s(line)\/([\w\.]+)/i, /android.+(line)\/([\w\.]+)\/iab/i], [e, a], [/headlesschrome(?:\/([\w\.]+)|\s)/i], [a, [e, "Chrome Headless"]], [/\swv\).+(chrome)\/([\w\.]+)/i], [[e, /(.+)/, "$1 WebView"], a], [/((?:oculus|samsung)browser)\/([\w\.]+)/i], [[e, /(.+(?:g|us))(.+)/, "$1 $2"], a], [/android.+version\/([\w\.]+)\s+(?:mobile\s?safari|safari)*/i], [a, [e, "Android Browser"]], [/(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i], [e, a], [/(dolfin)\/([\w\.]+)/i], [[e, "Dolphin"], a], [/((?:android.+)crmo|crios)\/([\w\.]+)/i], [[e, "Chrome"], a], [/(coast)\/([\w\.]+)/i], [[e, "Opera Coast"], a], [/fxios\/([\w\.-]+)/i], [a, [e, "Firefox"]], [/version\/([\w\.]+).+?mobile\/\w+\s(safari)/i], [a, [e, "Mobile Safari"]], [/version\/([\w\.]+).+?(mobile\s?safari|safari)/i], [a, e], [/webkit.+?(gsa)\/([\w\.]+).+?(mobile\s?safari|safari)(\/[\w\.]+)/i], [[e, "GSA"], a], [/webkit.+?(mobile\s?safari|safari)(\/[\w\.]+)/i], [e, [a, f.str, h.browser.oldsafari.version]], [/(konqueror)\/([\w\.]+)/i, /(webkit|khtml)\/([\w\.]+)/i], [e, a], [/(navigator|netscape)\/([\w\.-]+)/i], [[e, "Netscape"], a], [/(swiftfox)/i, /(icedragon|iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo|conkeror)[\/\s]?([\w\.\+]+)/i, /(firefox|seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([\w\.-]+)$/i, /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i, /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|sleipnir)[\/\s]?([\w\.]+)/i, /(links)\s\(([\w\.]+)/i, /(gobrowser)\/?([\w\.]*)/i, /(ice\s?browser)\/v?([\w\._]+)/i, /(mosaic)[\/\s]([\w\.]+)/i], [e, a]], cpu: [[/(?:(amd|x(?:(?:86|64)[_-])?|wow|win)64)[;\)]/i], [[d, "amd64"]], [/(ia32(?=;))/i], [[d, g.lowerize]], [/((?:i[346]|x)86)[;\)]/i], [[d, "ia32"]], [/windows\s(ce|mobile);\sppc;/i], [[d, "arm"]], [/((?:ppc|powerpc)(?:64)?)(?:\smac|;|\))/i], [[d, /ower/, "", g.lowerize]], [/(sun4\w)[;\)]/i], [[d, "sparc"]], [/((?:avr32|ia64(?=;))|68k(?=\))|arm(?:64|(?=v\d+[;l]))|(?=atmel\s)avr|(?:irix|mips|sparc)(?:64)?(?=;)|pa-risc)/i], [[d, g.lowerize]]], device: [[/\((ipad|playbook);[\w\s\);-]+(rim|apple)/i], [s, n, [o, w]], [/applecoremedia\/[\w\.]+ \((ipad)/], [s, [n, "Apple"], [o, w]], [/(apple\s{0,1}tv)/i], [[s, "Apple TV"], [n, "Apple"]], [/(archos)\s(gamepad2?)/i, /(hp).+(touchpad)/i, /(hp).+(tablet)/i, /(kindle)\/([\w\.]+)/i, /\s(nook)[\w\s]+build\/(\w+)/i, /(dell)\s(strea[kpr\s\d]*[\dko])/i], [n, s, [o, w]], [/(kf[A-z]+)\sbuild\/.+silk\//i], [s, [n, "Amazon"], [o, w]], [/(sd|kf)[0349hijorstuw]+\sbuild\/.+silk\//i], [[s, f.str, h.device.amazon.model], [n, "Amazon"], [o, l]], [/android.+aft([bms])\sbuild/i], [s, [n, "Amazon"], [o, b]], [/\((ip[honed|\s\w*]+);.+(apple)/i], [s, n, [o, l]], [/\((ip[honed|\s\w*]+);/i], [s, [n, "Apple"], [o, l]], [/(blackberry)[\s-]?(\w+)/i, /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[\s_-]?([\w-]*)/i, /(hp)\s([\w\s]+\w)/i, /(asus)-?(\w+)/i], [n, s, [o, l]], [/\(bb10;\s(\w+)/i], [s, [n, "BlackBerry"], [o, l]], [/android.+(transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+|nexus 7|padfone)/i], [s, [n, "Asus"], [o, w]], [/(sony)\s(tablet\s[ps])\sbuild\//i, /(sony)?(?:sgp.+)\sbuild\//i], [[n, "Sony"], [s, "Xperia Tablet"], [o, w]], [/android.+\s([c-g]\d{4}|so[-l]\w+)\sbuild\//i], [s, [n, "Sony"], [o, l]], [/\s(ouya)\s/i, /(nintendo)\s([wids3u]+)/i], [n, s, [o, t]], [/android.+;\s(shield)\sbuild/i], [s, [n, "Nvidia"], [o, t]], [/(playstation\s[34portablevi]+)/i], [s, [n, "Sony"], [o, t]], [/(sprint\s(\w+))/i], [[n, f.str, h.device.sprint.vendor], [s, f.str, h.device.sprint.model], [o, l]], [/(lenovo)\s?(S(?:5000|6000)+(?:[-][\w+]))/i], [n, s, [o, w]], [/(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i, /(zte)-(\w*)/i, /(alcatel|geeksphone|lenovo|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]*)/i], [n, [s, /_/g, " "], [o, l]], [/(nexus\s9)/i], [s, [n, "HTC"], [o, w]], [/d\/huawei([\w\s-]+)[;\)]/i, /(nexus\s6p)/i], [s, [n, "Huawei"], [o, l]], [/(microsoft);\s(lumia[\s\w]+)/i], [n, s, [o, l]], [/[\s\(;](xbox(?:\sone)?)[\s\);]/i], [s, [n, "Microsoft"], [o, t]], [/(kin\.[onetw]{3})/i], [[s, /\./g, " "], [n, "Microsoft"], [o, l]], [/\s(milestone|droid(?:[2-4x]|\s(?:bionic|x2|pro|razr))?:?(\s4g)?)[\w\s]+build\//i, /mot[\s-]?(\w*)/i, /(XT\d{3,4}) build\//i, /(nexus\s6)/i], [s, [n, "Motorola"], [o, l]], [/android.+\s(mz60\d|xoom[\s2]{0,2})\sbuild\//i], [s, [n, "Motorola"], [o, w]], [/hbbtv\/\d+\.\d+\.\d+\s+\([\w\s]*;\s*(\w[^;]*);([^;]*)/i], [[n, g.trim], [s, g.trim], [o, b]], [/hbbtv.+maple;(\d+)/i], [[s, /^/, "SmartTV"], [n, "Samsung"], [o, b]], [/\(dtv[\);].+(aquos)/i], [s, [n, "Sharp"], [o, b]], [/android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n\d+|sgh-t8[56]9|nexus 10))/i, /((SM-T\w+))/i], [[n, "Samsung"], s, [o, w]], [/smart-tv.+(samsung)/i], [n, [o, b], s], [/((s[cgp]h-\w+|gt-\w+|galaxy\snexus|sm-\w[\w\d]+))/i, /(sam[sung]*)[\s-]*(\w+-?[\w-]*)/i, /sec-((sgh\w+))/i], [[n, "Samsung"], s, [o, l]], [/sie-(\w*)/i], [s, [n, "Siemens"], [o, l]], [/(maemo|nokia).*(n900|lumia\s\d+)/i, /(nokia)[\s_-]?([\w-]*)/i], [[n, "Nokia"], s, [o, l]], [/android\s3\.[\s\w;-]{10}(a\d{3})/i], [s, [n, "Acer"], [o, w]], [/android.+([vl]k\-?\d{3})\s+build/i], [s, [n, "LG"], [o, w]], [/android\s3\.[\s\w;-]{10}(lg?)-([06cv9]{3,4})/i], [[n, "LG"], s, [o, w]], [/(lg) netcast\.tv/i], [n, s, [o, b]], [/(nexus\s[45])/i, /lg[e;\s\/-]+(\w*)/i, /android.+lg(\-?[\d\w]+)\s+build/i], [s, [n, "LG"], [o, l]], [/android.+(ideatab[a-z0-9\-\s]+)/i], [s, [n, "Lenovo"], [o, w]], [/linux;.+((jolla));/i], [n, s, [o, l]], [/((pebble))app\/[\d\.]+\s/i], [n, s, [o, p]], [/android.+;\s(oppo)\s?([\w\s]+)\sbuild/i], [n, s, [o, l]], [/crkey/i], [[s, "Chromecast"], [n, "Google"]], [/android.+;\s(glass)\s\d/i], [s, [n, "Google"], [o, p]], [/android.+;\s(pixel c)[\s)]/i], [s, [n, "Google"], [o, w]], [/android.+;\s(pixel( [23])?( xl)?)\s/i], [s, [n, "Google"], [o, l]], [/android.+;\s(\w+)\s+build\/hm\1/i, /android.+(hm[\s\-_]*note?[\s_]*(?:\d\w)?)\s+build/i, /android.+(mi[\s\-_]*(?:one|one[\s_]plus|note lte)?[\s_]*(?:\d?\w?)[\s_]*(?:plus)?)\s+build/i, /android.+(redmi[\s\-_]*(?:note)?(?:[\s_]*[\w\s]+))\s+build/i], [[s, /_/g, " "], [n, "Xiaomi"], [o, l]], [/android.+(mi[\s\-_]*(?:pad)(?:[\s_]*[\w\s]+))\s+build/i], [[s, /_/g, " "], [n, "Xiaomi"], [o, w]], [/android.+;\s(m[1-5]\snote)\sbuild/i], [s, [n, "Meizu"], [o, w]], [/(mz)-([\w-]{2,})/i], [[n, "Meizu"], s, [o, l]], [/android.+a000(1)\s+build/i, /android.+oneplus\s(a\d{4})\s+build/i], [s, [n, "OnePlus"], [o, l]], [/android.+[;\/]\s*(RCT[\d\w]+)\s+build/i], [s, [n, "RCA"], [o, w]], [/android.+[;\/\s]+(Venue[\d\s]{2,7})\s+build/i], [s, [n, "Dell"], [o, w]], [/android.+[;\/]\s*(Q[T|M][\d\w]+)\s+build/i], [s, [n, "Verizon"], [o, w]], [/android.+[;\/]\s+(Barnes[&\s]+Noble\s+|BN[RT])(V?.*)\s+build/i], [[n, "Barnes & Noble"], s, [o, w]], [/android.+[;\/]\s+(TM\d{3}.*\b)\s+build/i], [s, [n, "NuVision"], [o, w]], [/android.+;\s(k88)\sbuild/i], [s, [n, "ZTE"], [o, w]], [/android.+[;\/]\s*(gen\d{3})\s+build.*49h/i], [s, [n, "Swiss"], [o, l]], [/android.+[;\/]\s*(zur\d{3})\s+build/i], [s, [n, "Swiss"], [o, w]], [/android.+[;\/]\s*((Zeki)?TB.*\b)\s+build/i], [s, [n, "Zeki"], [o, w]], [/(android).+[;\/]\s+([YR]\d{2})\s+build/i, /android.+[;\/]\s+(Dragon[\-\s]+Touch\s+|DT)(\w{5})\sbuild/i], [[n, "Dragon Touch"], s, [o, w]], [/android.+[;\/]\s*(NS-?\w{0,9})\sbuild/i], [s, [n, "Insignia"], [o, w]], [/android.+[;\/]\s*((NX|Next)-?\w{0,9})\s+build/i], [s, [n, "NextBook"], [o, w]], [/android.+[;\/]\s*(Xtreme\_)?(V(1[045]|2[015]|30|40|60|7[05]|90))\s+build/i], [[n, "Voice"], s, [o, l]], [/android.+[;\/]\s*(LVTEL\-)?(V1[12])\s+build/i], [[n, "LvTel"], s, [o, l]], [/android.+;\s(PH-1)\s/i], [s, [n, "Essential"], [o, l]], [/android.+[;\/]\s*(V(100MD|700NA|7011|917G).*\b)\s+build/i], [s, [n, "Envizen"], [o, w]], [/android.+[;\/]\s*(Le[\s\-]+Pan)[\s\-]+(\w{1,9})\s+build/i], [n, s, [o, w]], [/android.+[;\/]\s*(Trio[\s\-]*.*)\s+build/i], [s, [n, "MachSpeed"], [o, w]], [/android.+[;\/]\s*(Trinity)[\-\s]*(T\d{3})\s+build/i], [n, s, [o, w]], [/android.+[;\/]\s*TU_(1491)\s+build/i], [s, [n, "Rotor"], [o, w]], [/android.+(KS(.+))\s+build/i], [s, [n, "Amazon"], [o, w]], [/android.+(Gigaset)[\s\-]+(Q\w{1,9})\s+build/i], [n, s, [o, w]], [/\s(tablet|tab)[;\/]/i, /\s(mobile)(?:[;\/]|\ssafari)/i], [[o, g.lowerize], n, s], [/(android[\w\.\s\-]{0,9});.+build/i], [s, [n, "Generic"]]], engine: [[/windows.+\sedge\/([\w\.]+)/i], [a, [e, "EdgeHTML"]], [/(presto)\/([\w\.]+)/i, /(webkit|trident|netfront|netsurf|amaya|lynx|w3m)\/([\w\.]+)/i, /(khtml|tasman|links)[\/\s]\(?([\w\.]+)/i, /(icab)[\/\s]([23]\.[\d\.]+)/i], [e, a], [/rv\:([\w\.]{1,9}).+(gecko)/i], [a, e]], os: [[/microsoft\s(windows)\s(vista|xp)/i], [e, a], [/(windows)\snt\s6\.2;\s(arm)/i, /(windows\sphone(?:\sos)*)[\s\/]?([\d\.\s\w]*)/i, /(windows\smobile|windows)[\s\/]?([ntce\d\.\s]+\w)/i], [e, [a, f.str, h.os.windows.version]], [/(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i], [[e, "Windows"], [a, f.str, h.os.windows.version]], [/\((bb)(10);/i], [[e, "BlackBerry"], a], [/(blackberry)\w*\/?([\w\.]*)/i, /(tizen)[\/\s]([\w\.]+)/i, /(android|webos|palm\sos|qnx|bada|rim\stablet\sos|meego|contiki)[\/\s-]?([\w\.]*)/i, /linux;.+(sailfish);/i], [e, a], [/(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]*)/i], [[e, "Symbian"], a], [/\((series40);/i], [e], [/mozilla.+\(mobile;.+gecko.+firefox/i], [[e, "Firefox OS"], a], [/(nintendo|playstation)\s([wids34portablevu]+)/i, /(mint)[\/\s\(]?(\w*)/i, /(mageia|vectorlinux)[;\s]/i, /(joli|[kxln]?ubuntu|debian|suse|opensuse|gentoo|(?=\s)arch|slackware|fedora|mandriva|centos|pclinuxos|redhat|zenwalk|linpus)[\/\s-]?(?!chrom)([\w\.-]*)/i, /(hurd|linux)\s?([\w\.]*)/i, /(gnu)\s?([\w\.]*)/i], [e, a], [/(cros)\s[\w]+\s([\w\.]+\w)/i], [[e, "Chromium OS"], a], [/(sunos)\s?([\w\.\d]*)/i], [[e, "Solaris"], a], [/\s([frentopc-]{0,4}bsd|dragonfly)\s?([\w\.]*)/i], [e, a], [/(haiku)\s(\w+)/i], [e, a], [/cfnetwork\/.+darwin/i, /ip[honead]{2,4}(?:.*os\s([\w]+)\slike\smac|;\sopera)/i], [[a, /_/g, "."], [e, "iOS"]], [/(mac\sos\sx)\s?([\w\s\.]*)/i, /(macintosh|mac(?=_powerpc)\s)/i], [[e, "Mac OS"], [a, /_/g, "."]], [/((?:open)?solaris)[\/\s-]?([\w\.]*)/i, /(aix)\s((\d)(?=\.|\)|\s)[\w\.])*/i, /(plan\s9|minix|beos|os\/2|amigaos|morphos|risc\sos|openvms|fuchsia)/i, /(unix)\s?([\w\.]*)/i], [e, a]] }, x = function (i, s) { if ("object" == typeof i && (s = i, i = u), !(this instanceof x)) return new x(i, s).getResult(); var e = i || (r && r.navigator && r.navigator.userAgent ? r.navigator.userAgent : ""), o = s ? g.extend(v, s) : v; return this.getBrowser = function () { var i = { name: u, version: u }; return f.rgx.call(i, e, o.browser), i.major = g.major(i.version), i }, this.getCPU = function () { var i = { architecture: u }; return f.rgx.call(i, e, o.cpu), i }, this.getDevice = function () { var i = { vendor: u, model: u, type: u }; return f.rgx.call(i, e, o.device), i }, this.getEngine = function () { var i = { name: u, version: u }; return f.rgx.call(i, e, o.engine), i }, this.getOS = function () { var i = { name: u, version: u }; return f.rgx.call(i, e, o.os), i }, this.getResult = function () { return { ua: this.getUA(), browser: this.getBrowser(), engine: this.getEngine(), os: this.getOS(), device: this.getDevice(), cpu: this.getCPU() } }, this.getUA = function () { return e }, this.setUA = function (i) { return e = i, this }, this }; x.VERSION = "0.7.19", x.BROWSER = { NAME: e, MAJOR: "major", VERSION: a }, x.CPU = { ARCHITECTURE: d }, x.DEVICE = { MODEL: s, VENDOR: n, TYPE: o, CONSOLE: t, MOBILE: l, SMARTTV: b, TABLET: w, WEARABLE: p, EMBEDDED: "embedded" }, x.ENGINE = { NAME: e, VERSION: a }, x.OS = { NAME: e, VERSION: a }, typeof exports !== i ? (typeof module !== i && module.exports && (exports = module.exports = x), exports.UAParser = x) : typeof define === c && define.amd ? define(function () { return x }) : r && (r.UAParser = x); var k = r && (r.jQuery || r.Zepto); if (typeof k !== i && !k.ua) { var y = new x; k.ua = y.getResult(), k.ua.get = function () { return y.getUA() }, k.ua.set = function (i) { y.setUA(i); var s = y.getResult(); for (var e in s) k.ua[e] = s[e] } } }("object" == typeof window ? window : this);
+/*
+* Fingerprintjs2 2.0.6 - Modern & flexible browser fingerprint library v2
+* https://github.com/Valve/fingerprintjs2
+* Copyright (c) 2015 Valentin Vasilyev (valentin.vasilyev@outlook.com)
+* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL VALENTIN VASILYEV BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* global define */
+(function (name, context, definition) {
+    'use strict'
+    if (typeof window !== 'undefined' && typeof define === 'function' && define.amd) { define(definition) } else if (typeof module !== 'undefined' && module.exports) { module.exports = definition() } else if (context.exports) { context.exports = definition() } else { context[name] = definition() }
+  })('Fingerprint2', this, function () {
+    'use strict'
+
+  /// MurmurHash3 related functions
+
+  //
+  // Given two 64bit ints (as an array of two 32bit ints) returns the two
+  // added together as a 64bit int (as an array of two 32bit ints).
+  //
+    var x64Add = function (m, n) {
+      m = [m[0] >>> 16, m[0] & 0xffff, m[1] >>> 16, m[1] & 0xffff]
+      n = [n[0] >>> 16, n[0] & 0xffff, n[1] >>> 16, n[1] & 0xffff]
+      var o = [0, 0, 0, 0]
+      o[3] += m[3] + n[3]
+      o[2] += o[3] >>> 16
+      o[3] &= 0xffff
+      o[2] += m[2] + n[2]
+      o[1] += o[2] >>> 16
+      o[2] &= 0xffff
+      o[1] += m[1] + n[1]
+      o[0] += o[1] >>> 16
+      o[1] &= 0xffff
+      o[0] += m[0] + n[0]
+      o[0] &= 0xffff
+      return [(o[0] << 16) | o[1], (o[2] << 16) | o[3]]
+    }
+
+  //
+  // Given two 64bit ints (as an array of two 32bit ints) returns the two
+  // multiplied together as a 64bit int (as an array of two 32bit ints).
+  //
+    var x64Multiply = function (m, n) {
+      m = [m[0] >>> 16, m[0] & 0xffff, m[1] >>> 16, m[1] & 0xffff]
+      n = [n[0] >>> 16, n[0] & 0xffff, n[1] >>> 16, n[1] & 0xffff]
+      var o = [0, 0, 0, 0]
+      o[3] += m[3] * n[3]
+      o[2] += o[3] >>> 16
+      o[3] &= 0xffff
+      o[2] += m[2] * n[3]
+      o[1] += o[2] >>> 16
+      o[2] &= 0xffff
+      o[2] += m[3] * n[2]
+      o[1] += o[2] >>> 16
+      o[2] &= 0xffff
+      o[1] += m[1] * n[3]
+      o[0] += o[1] >>> 16
+      o[1] &= 0xffff
+      o[1] += m[2] * n[2]
+      o[0] += o[1] >>> 16
+      o[1] &= 0xffff
+      o[1] += m[3] * n[1]
+      o[0] += o[1] >>> 16
+      o[1] &= 0xffff
+      o[0] += (m[0] * n[3]) + (m[1] * n[2]) + (m[2] * n[1]) + (m[3] * n[0])
+      o[0] &= 0xffff
+      return [(o[0] << 16) | o[1], (o[2] << 16) | o[3]]
+    }
+  //
+  // Given a 64bit int (as an array of two 32bit ints) and an int
+  // representing a number of bit positions, returns the 64bit int (as an
+  // array of two 32bit ints) rotated left by that number of positions.
+  //
+    var x64Rotl = function (m, n) {
+      n %= 64
+      if (n === 32) {
+        return [m[1], m[0]]
+      } else if (n < 32) {
+        return [(m[0] << n) | (m[1] >>> (32 - n)), (m[1] << n) | (m[0] >>> (32 - n))]
+      } else {
+        n -= 32
+        return [(m[1] << n) | (m[0] >>> (32 - n)), (m[0] << n) | (m[1] >>> (32 - n))]
+      }
+    }
+  //
+  // Given a 64bit int (as an array of two 32bit ints) and an int
+  // representing a number of bit positions, returns the 64bit int (as an
+  // array of two 32bit ints) shifted left by that number of positions.
+  //
+    var x64LeftShift = function (m, n) {
+      n %= 64
+      if (n === 0) {
+        return m
+      } else if (n < 32) {
+        return [(m[0] << n) | (m[1] >>> (32 - n)), m[1] << n]
+      } else {
+        return [m[1] << (n - 32), 0]
+      }
+    }
+  //
+  // Given two 64bit ints (as an array of two 32bit ints) returns the two
+  // xored together as a 64bit int (as an array of two 32bit ints).
+  //
+    var x64Xor = function (m, n) {
+      return [m[0] ^ n[0], m[1] ^ n[1]]
+    }
+  //
+  // Given a block, returns murmurHash3's final x64 mix of that block.
+  // (`[0, h[0] >>> 1]` is a 33 bit unsigned right shift. This is the
+  // only place where we need to right shift 64bit ints.)
+  //
+    var x64Fmix = function (h) {
+      h = x64Xor(h, [0, h[0] >>> 1])
+      h = x64Multiply(h, [0xff51afd7, 0xed558ccd])
+      h = x64Xor(h, [0, h[0] >>> 1])
+      h = x64Multiply(h, [0xc4ceb9fe, 0x1a85ec53])
+      h = x64Xor(h, [0, h[0] >>> 1])
+      return h
+    }
+
+  //
+  // Given a string and an optional seed as an int, returns a 128 bit
+  // hash using the x64 flavor of MurmurHash3, as an unsigned hex.
+  //
+    var x64hash128 = function (key, seed) {
+      key = key || ''
+      seed = seed || 0
+      var remainder = key.length % 16
+      var bytes = key.length - remainder
+      var h1 = [0, seed]
+      var h2 = [0, seed]
+      var k1 = [0, 0]
+      var k2 = [0, 0]
+      var c1 = [0x87c37b91, 0x114253d5]
+      var c2 = [0x4cf5ad43, 0x2745937f]
+      for (var i = 0; i < bytes; i = i + 16) {
+        k1 = [((key.charCodeAt(i + 4) & 0xff)) | ((key.charCodeAt(i + 5) & 0xff) << 8) | ((key.charCodeAt(i + 6) & 0xff) << 16) | ((key.charCodeAt(i + 7) & 0xff) << 24), ((key.charCodeAt(i) & 0xff)) | ((key.charCodeAt(i + 1) & 0xff) << 8) | ((key.charCodeAt(i + 2) & 0xff) << 16) | ((key.charCodeAt(i + 3) & 0xff) << 24)]
+        k2 = [((key.charCodeAt(i + 12) & 0xff)) | ((key.charCodeAt(i + 13) & 0xff) << 8) | ((key.charCodeAt(i + 14) & 0xff) << 16) | ((key.charCodeAt(i + 15) & 0xff) << 24), ((key.charCodeAt(i + 8) & 0xff)) | ((key.charCodeAt(i + 9) & 0xff) << 8) | ((key.charCodeAt(i + 10) & 0xff) << 16) | ((key.charCodeAt(i + 11) & 0xff) << 24)]
+        k1 = x64Multiply(k1, c1)
+        k1 = x64Rotl(k1, 31)
+        k1 = x64Multiply(k1, c2)
+        h1 = x64Xor(h1, k1)
+        h1 = x64Rotl(h1, 27)
+        h1 = x64Add(h1, h2)
+        h1 = x64Add(x64Multiply(h1, [0, 5]), [0, 0x52dce729])
+        k2 = x64Multiply(k2, c2)
+        k2 = x64Rotl(k2, 33)
+        k2 = x64Multiply(k2, c1)
+        h2 = x64Xor(h2, k2)
+        h2 = x64Rotl(h2, 31)
+        h2 = x64Add(h2, h1)
+        h2 = x64Add(x64Multiply(h2, [0, 5]), [0, 0x38495ab5])
+      }
+      k1 = [0, 0]
+      k2 = [0, 0]
+      switch (remainder) {
+        case 15:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 14)], 48))
+        // fallthrough
+        case 14:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 13)], 40))
+        // fallthrough
+        case 13:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 12)], 32))
+        // fallthrough
+        case 12:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 11)], 24))
+        // fallthrough
+        case 11:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 10)], 16))
+        // fallthrough
+        case 10:
+          k2 = x64Xor(k2, x64LeftShift([0, key.charCodeAt(i + 9)], 8))
+        // fallthrough
+        case 9:
+          k2 = x64Xor(k2, [0, key.charCodeAt(i + 8)])
+          k2 = x64Multiply(k2, c2)
+          k2 = x64Rotl(k2, 33)
+          k2 = x64Multiply(k2, c1)
+          h2 = x64Xor(h2, k2)
+        // fallthrough
+        case 8:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 7)], 56))
+        // fallthrough
+        case 7:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 6)], 48))
+        // fallthrough
+        case 6:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 5)], 40))
+        // fallthrough
+        case 5:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 4)], 32))
+        // fallthrough
+        case 4:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 3)], 24))
+        // fallthrough
+        case 3:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 2)], 16))
+        // fallthrough
+        case 2:
+          k1 = x64Xor(k1, x64LeftShift([0, key.charCodeAt(i + 1)], 8))
+        // fallthrough
+        case 1:
+          k1 = x64Xor(k1, [0, key.charCodeAt(i)])
+          k1 = x64Multiply(k1, c1)
+          k1 = x64Rotl(k1, 31)
+          k1 = x64Multiply(k1, c2)
+          h1 = x64Xor(h1, k1)
+        // fallthrough
+      }
+      h1 = x64Xor(h1, [0, key.length])
+      h2 = x64Xor(h2, [0, key.length])
+      h1 = x64Add(h1, h2)
+      h2 = x64Add(h2, h1)
+      h1 = x64Fmix(h1)
+      h2 = x64Fmix(h2)
+      h1 = x64Add(h1, h2)
+      h2 = x64Add(h2, h1)
+      return ('00000000' + (h1[0] >>> 0).toString(16)).slice(-8) + ('00000000' + (h1[1] >>> 0).toString(16)).slice(-8) + ('00000000' + (h2[0] >>> 0).toString(16)).slice(-8) + ('00000000' + (h2[1] >>> 0).toString(16)).slice(-8)
+    }
+
+    var defaultOptions = {
+      preprocessor: null,
+      audio: {
+        timeout: 1000,
+          // On iOS 11, audio context can only be used in response to user interaction.
+          // We require users to explicitly enable audio fingerprinting on iOS 11.
+          // See https://stackoverflow.com/questions/46363048/onaudioprocess-not-called-on-ios11#46534088
+        excludeIOS11: true
+      },
+      fonts: {
+        swfContainerId: 'fingerprintjs2',
+        swfPath: 'flash/compiled/FontList.swf',
+        userDefinedFonts: [],
+        extendedJsFonts: false
+      },
+      screen: {
+         // To ensure consistent fingerprints when users rotate their mobile devices
+        detectScreenOrientation: true
+      },
+      plugins: {
+        sortPluginsFor: [/palemoon/i],
+        excludeIE: false
+      },
+      extraComponents: [],
+      excludes: {
+        // Unreliable on Windows, see https://github.com/Valve/fingerprintjs2/issues/375
+        'enumerateDevices': true,
+        // devicePixelRatio depends on browser zoom, and it's impossible to detect browser zoom
+        'pixelRatio': true,
+        // DNT depends on incognito mode for some browsers (Chrome) and it's impossible to detect incognito mode
+        'doNotTrack': true,
+        // uses js fonts already
+        'fontsFlash': true
+      },
+      NOT_AVAILABLE: 'not available',
+      ERROR: 'error',
+      EXCLUDED: 'excluded'
+    }
+
+    var each = function (obj, iterator) {
+      if (Array.prototype.forEach && obj.forEach === Array.prototype.forEach) {
+        obj.forEach(iterator)
+      } else if (obj.length === +obj.length) {
+        for (var i = 0, l = obj.length; i < l; i++) {
+          iterator(obj[i], i, obj)
+        }
+      } else {
+        for (var key in obj) {
+          if (obj.hasOwnProperty(key)) {
+            iterator(obj[key], key, obj)
+          }
+        }
+      }
+    }
+
+    var map = function (obj, iterator) {
+      var results = []
+      // Not using strict equality so that this acts as a
+      // shortcut to checking for `null` and `undefined`.
+      if (obj == null) {
+        return results
+      }
+      if (Array.prototype.map && obj.map === Array.prototype.map) { return obj.map(iterator) }
+      each(obj, function (value, index, list) {
+        results.push(iterator(value, index, list))
+      })
+      return results
+    }
+
+    var extendSoft = function (target, source) {
+      if (source == null) { return target }
+      var value
+      var key
+      for (key in source) {
+        value = source[key]
+        if (value != null && !(Object.prototype.hasOwnProperty.call(target, key))) {
+          target[key] = value
+        }
+      }
+      return target
+    }
+
+  // https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/enumerateDevices
+    var enumerateDevicesKey = function (done, options) {
+      if (!isEnumerateDevicesSupported()) {
+        return done(options.NOT_AVAILABLE)
+      }
+      navigator.mediaDevices.enumerateDevices().then(function (devices) {
+        done(devices.map(function (device) {
+          return 'id=' + device.deviceId + ';gid=' + device.groupId + ';' + device.kind + ';' + device.label
+        }))
+      })
+        .catch(function (error) {
+          done(error)
+        })
+    }
+
+    var isEnumerateDevicesSupported = function () {
+      return (navigator.mediaDevices && navigator.mediaDevices.enumerateDevices)
+    }
+  // Inspired by and based on https://github.com/cozylife/audio-fingerprint
+    var audioKey = function (done, options) {
+      var audioOptions = options.audio
+      if (audioOptions.excludeIOS11 && navigator.userAgent.match(/OS 11.+Version\/11.+Safari/)) {
+          // See comment for excludeUserAgent and https://stackoverflow.com/questions/46363048/onaudioprocess-not-called-on-ios11#46534088
+        return done(options.EXCLUDED)
+      }
+
+      var AudioContext = window.OfflineAudioContext || window.webkitOfflineAudioContext
+
+      if (AudioContext == null) {
+        return done(options.NOT_AVAILABLE)
+      }
+
+      var context = new AudioContext(1, 44100, 44100)
+
+      var oscillator = context.createOscillator()
+      oscillator.type = 'triangle'
+      oscillator.frequency.setValueAtTime(10000, context.currentTime)
+
+      var compressor = context.createDynamicsCompressor()
+      each([
+          ['threshold', -50],
+          ['knee', 40],
+          ['ratio', 12],
+          ['reduction', -20],
+          ['attack', 0],
+          ['release', 0.25]
+      ], function (item) {
+        if (compressor[item[0]] !== undefined && typeof compressor[item[0]].setValueAtTime === 'function') {
+          compressor[item[0]].setValueAtTime(item[1], context.currentTime)
+        }
+      })
+
+      oscillator.connect(compressor)
+      compressor.connect(context.destination)
+      oscillator.start(0)
+      context.startRendering()
+
+      var audioTimeoutId = setTimeout(function () {
+        console.warn('Audio fingerprint timed out. Please report bug at https://github.com/Valve/fingerprintjs2 with your user agent: "' + navigator.userAgent + '".')
+        context.oncomplete = function () {}
+        context = null
+        return done('audioTimeout')
+      }, audioOptions.timeout)
+
+      context.oncomplete = function (event) {
+        var fingerprint
+        try {
+          clearTimeout(audioTimeoutId)
+          fingerprint = event.renderedBuffer.getChannelData(0)
+              .slice(4500, 5000)
+              .reduce(function (acc, val) { return acc + Math.abs(val) }, 0)
+              .toString()
+          oscillator.disconnect()
+          compressor.disconnect()
+        } catch (error) {
+          done(error)
+          return
+        }
+        done(fingerprint)
+      }
+    }
+    var UserAgent = function (done) {
+      done(navigator.userAgent)
+    }
+    var languageKey = function (done, options) {
+      done(navigator.language || navigator.userLanguage || navigator.browserLanguage || navigator.systemLanguage || options.NOT_AVAILABLE)
+    }
+    var colorDepthKey = function (done, options) {
+      done(window.screen.colorDepth || options.NOT_AVAILABLE)
+    }
+    var deviceMemoryKey = function (done, options) {
+      done(navigator.deviceMemory || options.NOT_AVAILABLE)
+    }
+    var pixelRatioKey = function (done, options) {
+      done(window.devicePixelRatio || options.NOT_AVAILABLE)
+    }
+    var screenResolutionKey = function (done, options) {
+      done(getScreenResolution(options))
+    }
+    var getScreenResolution = function (options) {
+      var resolution = [window.screen.width, window.screen.height]
+      if (options.screen.detectScreenOrientation) {
+        resolution.sort().reverse()
+      }
+      return resolution
+    }
+    var availableScreenResolutionKey = function (done, options) {
+      done(getAvailableScreenResolution(options))
+    }
+    var getAvailableScreenResolution = function (options) {
+      if (window.screen.availWidth && window.screen.availHeight) {
+        var available = [window.screen.availHeight, window.screen.availWidth]
+        if (options.screen.detectScreenOrientation) {
+          available.sort().reverse()
+        }
+        return available
+      }
+      // headless browsers
+      return options.NOT_AVAILABLE
+    }
+    var timezoneOffset = function (done) {
+      done(new Date().getTimezoneOffset())
+    }
+    var timezone = function (done, options) {
+      if (window.Intl && window.Intl.DateTimeFormat) {
+        done(new window.Intl.DateTimeFormat().resolvedOptions().timeZone)
+        return
+      }
+      done(options.NOT_AVAILABLE)
+    }
+    var sessionStorageKey = function (done, options) {
+      done(hasSessionStorage(options))
+    }
+    var localStorageKey = function (done, options) {
+      done(hasLocalStorage(options))
+    }
+    var indexedDbKey = function (done, options) {
+      done(hasIndexedDB(options))
+    }
+    var addBehaviorKey = function (done) {
+        // body might not be defined at this point or removed programmatically
+      done(!!(document.body && document.body.addBehavior))
+    }
+    var openDatabaseKey = function (done) {
+      done(!!window.openDatabase)
+    }
+    var cpuClassKey = function (done, options) {
+      done(getNavigatorCpuClass(options))
+    }
+    var platformKey = function (done, options) {
+      done(getNavigatorPlatform(options))
+    }
+    var doNotTrackKey = function (done, options) {
+      done(getDoNotTrack(options))
+    }
+    var canvasKey = function (done, options) {
+      if (isCanvasSupported()) {
+        done(getCanvasFp(options))
+        return
+      }
+      done(options.NOT_AVAILABLE)
+    }
+    var webglKey = function (done, options) {
+      if (isWebGlSupported()) {
+        done(getWebglFp())
+        return
+      }
+      done(options.NOT_AVAILABLE)
+    }
+    var webglVendorAndRendererKey = function (done) {
+      if (isWebGlSupported()) {
+        done(getWebglVendorAndRenderer())
+        return
+      }
+      done()
+    }
+    var adBlockKey = function (done) {
+      done(getAdBlock())
+    }
+    var hasLiedLanguagesKey = function (done) {
+      done(getHasLiedLanguages())
+    }
+    var hasLiedResolutionKey = function (done) {
+      done(getHasLiedResolution())
+    }
+    var hasLiedOsKey = function (done) {
+      done(getHasLiedOs())
+    }
+    var hasLiedBrowserKey = function (done) {
+      done(getHasLiedBrowser())
+    }
+  // flash fonts (will increase fingerprinting time 20X to ~ 130-150ms)
+    var flashFontsKey = function (done, options) {
+      // we do flash if swfobject is loaded
+      if (!hasSwfObjectLoaded()) {
+        return done('swf object not loaded')
+      }
+      if (!hasMinFlashInstalled()) {
+        return done('flash not installed')
+      }
+      if (!options.fonts.swfPath) {
+        return done('missing options.fonts.swfPath')
+      }
+      loadSwfAndDetectFonts(function (fonts) {
+        done(fonts)
+      }, options)
+    }
+  // kudos to http://www.lalit.org/lab/javascript-css-font-detect/
+    var jsFontsKey = function (done, options) {
+        // a font will be compared against all the three default fonts.
+        // and if it doesn't match all 3 then that font is not available.
+      var baseFonts = ['monospace', 'sans-serif', 'serif']
+
+      var fontList = [
+        'Andale Mono', 'Arial', 'Arial Black', 'Arial Hebrew', 'Arial MT', 'Arial Narrow', 'Arial Rounded MT Bold', 'Arial Unicode MS',
+        'Bitstream Vera Sans Mono', 'Book Antiqua', 'Bookman Old Style',
+        'Calibri', 'Cambria', 'Cambria Math', 'Century', 'Century Gothic', 'Century Schoolbook', 'Comic Sans', 'Comic Sans MS', 'Consolas', 'Courier', 'Courier New',
+        'Geneva', 'Georgia',
+        'Helvetica', 'Helvetica Neue',
+        'Impact',
+        'Lucida Bright', 'Lucida Calligraphy', 'Lucida Console', 'Lucida Fax', 'LUCIDA GRANDE', 'Lucida Handwriting', 'Lucida Sans', 'Lucida Sans Typewriter', 'Lucida Sans Unicode',
+        'Microsoft Sans Serif', 'Monaco', 'Monotype Corsiva', 'MS Gothic', 'MS Outlook', 'MS PGothic', 'MS Reference Sans Serif', 'MS Sans Serif', 'MS Serif', 'MYRIAD', 'MYRIAD PRO',
+        'Palatino', 'Palatino Linotype',
+        'Segoe Print', 'Segoe Script', 'Segoe UI', 'Segoe UI Light', 'Segoe UI Semibold', 'Segoe UI Symbol',
+        'Tahoma', 'Times', 'Times New Roman', 'Times New Roman PS', 'Trebuchet MS',
+        'Verdana', 'Wingdings', 'Wingdings 2', 'Wingdings 3'
+      ]
+
+      if (options.fonts.extendedJsFonts) {
+        var extendedFontList = [
+          'Abadi MT Condensed Light', 'Academy Engraved LET', 'ADOBE CASLON PRO', 'Adobe Garamond', 'ADOBE GARAMOND PRO', 'Agency FB', 'Aharoni', 'Albertus Extra Bold', 'Albertus Medium', 'Algerian', 'Amazone BT', 'American Typewriter',
+          'American Typewriter Condensed', 'AmerType Md BT', 'Andalus', 'Angsana New', 'AngsanaUPC', 'Antique Olive', 'Aparajita', 'Apple Chancery', 'Apple Color Emoji', 'Apple SD Gothic Neo', 'Arabic Typesetting', 'ARCHER',
+          'ARNO PRO', 'Arrus BT', 'Aurora Cn BT', 'AvantGarde Bk BT', 'AvantGarde Md BT', 'AVENIR', 'Ayuthaya', 'Bandy', 'Bangla Sangam MN', 'Bank Gothic', 'BankGothic Md BT', 'Baskerville',
+          'Baskerville Old Face', 'Batang', 'BatangChe', 'Bauer Bodoni', 'Bauhaus 93', 'Bazooka', 'Bell MT', 'Bembo', 'Benguiat Bk BT', 'Berlin Sans FB', 'Berlin Sans FB Demi', 'Bernard MT Condensed', 'BernhardFashion BT', 'BernhardMod BT', 'Big Caslon', 'BinnerD',
+          'Blackadder ITC', 'BlairMdITC TT', 'Bodoni 72', 'Bodoni 72 Oldstyle', 'Bodoni 72 Smallcaps', 'Bodoni MT', 'Bodoni MT Black', 'Bodoni MT Condensed', 'Bodoni MT Poster Compressed',
+          'Bookshelf Symbol 7', 'Boulder', 'Bradley Hand', 'Bradley Hand ITC', 'Bremen Bd BT', 'Britannic Bold', 'Broadway', 'Browallia New', 'BrowalliaUPC', 'Brush Script MT', 'Californian FB', 'Calisto MT', 'Calligrapher', 'Candara',
+          'CaslonOpnface BT', 'Castellar', 'Centaur', 'Cezanne', 'CG Omega', 'CG Times', 'Chalkboard', 'Chalkboard SE', 'Chalkduster', 'Charlesworth', 'Charter Bd BT', 'Charter BT', 'Chaucer',
+          'ChelthmITC Bk BT', 'Chiller', 'Clarendon', 'Clarendon Condensed', 'CloisterBlack BT', 'Cochin', 'Colonna MT', 'Constantia', 'Cooper Black', 'Copperplate', 'Copperplate Gothic', 'Copperplate Gothic Bold',
+          'Copperplate Gothic Light', 'CopperplGoth Bd BT', 'Corbel', 'Cordia New', 'CordiaUPC', 'Cornerstone', 'Coronet', 'Cuckoo', 'Curlz MT', 'DaunPenh', 'Dauphin', 'David', 'DB LCD Temp', 'DELICIOUS', 'Denmark',
+          'DFKai-SB', 'Didot', 'DilleniaUPC', 'DIN', 'DokChampa', 'Dotum', 'DotumChe', 'Ebrima', 'Edwardian Script ITC', 'Elephant', 'English 111 Vivace BT', 'Engravers MT', 'EngraversGothic BT', 'Eras Bold ITC', 'Eras Demi ITC', 'Eras Light ITC', 'Eras Medium ITC',
+          'EucrosiaUPC', 'Euphemia', 'Euphemia UCAS', 'EUROSTILE', 'Exotc350 Bd BT', 'FangSong', 'Felix Titling', 'Fixedsys', 'FONTIN', 'Footlight MT Light', 'Forte',
+          'FrankRuehl', 'Fransiscan', 'Freefrm721 Blk BT', 'FreesiaUPC', 'Freestyle Script', 'French Script MT', 'FrnkGothITC Bk BT', 'Fruitger', 'FRUTIGER',
+          'Futura', 'Futura Bk BT', 'Futura Lt BT', 'Futura Md BT', 'Futura ZBlk BT', 'FuturaBlack BT', 'Gabriola', 'Galliard BT', 'Gautami', 'Geeza Pro', 'Geometr231 BT', 'Geometr231 Hv BT', 'Geometr231 Lt BT', 'GeoSlab 703 Lt BT',
+          'GeoSlab 703 XBd BT', 'Gigi', 'Gill Sans', 'Gill Sans MT', 'Gill Sans MT Condensed', 'Gill Sans MT Ext Condensed Bold', 'Gill Sans Ultra Bold', 'Gill Sans Ultra Bold Condensed', 'Gisha', 'Gloucester MT Extra Condensed', 'GOTHAM', 'GOTHAM BOLD',
+          'Goudy Old Style', 'Goudy Stout', 'GoudyHandtooled BT', 'GoudyOLSt BT', 'Gujarati Sangam MN', 'Gulim', 'GulimChe', 'Gungsuh', 'GungsuhChe', 'Gurmukhi MN', 'Haettenschweiler', 'Harlow Solid Italic', 'Harrington', 'Heather', 'Heiti SC', 'Heiti TC', 'HELV',
+          'Herald', 'High Tower Text', 'Hiragino Kaku Gothic ProN', 'Hiragino Mincho ProN', 'Hoefler Text', 'Humanst 521 Cn BT', 'Humanst521 BT', 'Humanst521 Lt BT', 'Imprint MT Shadow', 'Incised901 Bd BT', 'Incised901 BT',
+          'Incised901 Lt BT', 'INCONSOLATA', 'Informal Roman', 'Informal011 BT', 'INTERSTATE', 'IrisUPC', 'Iskoola Pota', 'JasmineUPC', 'Jazz LET', 'Jenson', 'Jester', 'Jokerman', 'Juice ITC', 'Kabel Bk BT', 'Kabel Ult BT', 'Kailasa', 'KaiTi', 'Kalinga', 'Kannada Sangam MN',
+          'Kartika', 'Kaufmann Bd BT', 'Kaufmann BT', 'Khmer UI', 'KodchiangUPC', 'Kokila', 'Korinna BT', 'Kristen ITC', 'Krungthep', 'Kunstler Script', 'Lao UI', 'Latha', 'Leelawadee', 'Letter Gothic', 'Levenim MT', 'LilyUPC', 'Lithograph', 'Lithograph Light', 'Long Island',
+          'Lydian BT', 'Magneto', 'Maiandra GD', 'Malayalam Sangam MN', 'Malgun Gothic',
+          'Mangal', 'Marigold', 'Marion', 'Marker Felt', 'Market', 'Marlett', 'Matisse ITC', 'Matura MT Script Capitals', 'Meiryo', 'Meiryo UI', 'Microsoft Himalaya', 'Microsoft JhengHei', 'Microsoft New Tai Lue', 'Microsoft PhagsPa', 'Microsoft Tai Le',
+          'Microsoft Uighur', 'Microsoft YaHei', 'Microsoft Yi Baiti', 'MingLiU', 'MingLiU_HKSCS', 'MingLiU_HKSCS-ExtB', 'MingLiU-ExtB', 'Minion', 'Minion Pro', 'Miriam', 'Miriam Fixed', 'Mistral', 'Modern', 'Modern No. 20', 'Mona Lisa Solid ITC TT', 'Mongolian Baiti',
+          'MONO', 'MoolBoran', 'Mrs Eaves', 'MS LineDraw', 'MS Mincho', 'MS PMincho', 'MS Reference Specialty', 'MS UI Gothic', 'MT Extra', 'MUSEO', 'MV Boli',
+          'Nadeem', 'Narkisim', 'NEVIS', 'News Gothic', 'News GothicMT', 'NewsGoth BT', 'Niagara Engraved', 'Niagara Solid', 'Noteworthy', 'NSimSun', 'Nyala', 'OCR A Extended', 'Old Century', 'Old English Text MT', 'Onyx', 'Onyx BT', 'OPTIMA', 'Oriya Sangam MN',
+          'OSAKA', 'OzHandicraft BT', 'Palace Script MT', 'Papyrus', 'Parchment', 'Party LET', 'Pegasus', 'Perpetua', 'Perpetua Titling MT', 'PetitaBold', 'Pickwick', 'Plantagenet Cherokee', 'Playbill', 'PMingLiU', 'PMingLiU-ExtB',
+          'Poor Richard', 'Poster', 'PosterBodoni BT', 'PRINCETOWN LET', 'Pristina', 'PTBarnum BT', 'Pythagoras', 'Raavi', 'Rage Italic', 'Ravie', 'Ribbon131 Bd BT', 'Rockwell', 'Rockwell Condensed', 'Rockwell Extra Bold', 'Rod', 'Roman', 'Sakkal Majalla',
+          'Santa Fe LET', 'Savoye LET', 'Sceptre', 'Script', 'Script MT Bold', 'SCRIPTINA', 'Serifa', 'Serifa BT', 'Serifa Th BT', 'ShelleyVolante BT', 'Sherwood',
+          'Shonar Bangla', 'Showcard Gothic', 'Shruti', 'Signboard', 'SILKSCREEN', 'SimHei', 'Simplified Arabic', 'Simplified Arabic Fixed', 'SimSun', 'SimSun-ExtB', 'Sinhala Sangam MN', 'Sketch Rockwell', 'Skia', 'Small Fonts', 'Snap ITC', 'Snell Roundhand', 'Socket',
+          'Souvenir Lt BT', 'Staccato222 BT', 'Steamer', 'Stencil', 'Storybook', 'Styllo', 'Subway', 'Swis721 BlkEx BT', 'Swiss911 XCm BT', 'Sylfaen', 'Synchro LET', 'System', 'Tamil Sangam MN', 'Technical', 'Teletype', 'Telugu Sangam MN', 'Tempus Sans ITC',
+          'Terminal', 'Thonburi', 'Traditional Arabic', 'Trajan', 'TRAJAN PRO', 'Tristan', 'Tubular', 'Tunga', 'Tw Cen MT', 'Tw Cen MT Condensed', 'Tw Cen MT Condensed Extra Bold',
+          'TypoUpright BT', 'Unicorn', 'Univers', 'Univers CE 55 Medium', 'Univers Condensed', 'Utsaah', 'Vagabond', 'Vani', 'Vijaya', 'Viner Hand ITC', 'VisualUI', 'Vivaldi', 'Vladimir Script', 'Vrinda', 'Westminster', 'WHITNEY', 'Wide Latin',
+          'ZapfEllipt BT', 'ZapfHumnst BT', 'ZapfHumnst Dm BT', 'Zapfino', 'Zurich BlkEx BT', 'Zurich Ex BT', 'ZWAdobeF']
+        fontList = fontList.concat(extendedFontList)
+      }
+
+      fontList = fontList.concat(options.fonts.userDefinedFonts)
+
+        // remove duplicate fonts
+      fontList = fontList.filter(function (font, position) {
+        return fontList.indexOf(font) === position
+      })
+
+        // we use m or w because these two characters take up the maximum width.
+        // And we use a LLi so that the same matching fonts can get separated
+      var testString = 'mmmmmmmmmmlli'
+
+        // we test using 72px font size, we may use any size. I guess larger the better.
+      var testSize = '72px'
+
+      var h = document.getElementsByTagName('body')[0]
+
+        // div to load spans for the base fonts
+      var baseFontsDiv = document.createElement('div')
+
+        // div to load spans for the fonts to detect
+      var fontsDiv = document.createElement('div')
+
+      var defaultWidth = {}
+      var defaultHeight = {}
+
+        // creates a span where the fonts will be loaded
+      var createSpan = function () {
+        var s = document.createElement('span')
+          /*
+           * We need this css as in some weird browser this
+           * span elements shows up for a microSec which creates a
+           * bad user experience
+           */
+        s.style.position = 'absolute'
+        s.style.left = '-9999px'
+        s.style.fontSize = testSize
+
+          // css font reset to reset external styles
+        s.style.fontStyle = 'normal'
+        s.style.fontWeight = 'normal'
+        s.style.letterSpacing = 'normal'
+        s.style.lineBreak = 'auto'
+        s.style.lineHeight = 'normal'
+        s.style.textTransform = 'none'
+        s.style.textAlign = 'left'
+        s.style.textDecoration = 'none'
+        s.style.textShadow = 'none'
+        s.style.whiteSpace = 'normal'
+        s.style.wordBreak = 'normal'
+        s.style.wordSpacing = 'normal'
+
+        s.innerHTML = testString
+        return s
+      }
+
+        // creates a span and load the font to detect and a base font for fallback
+      var createSpanWithFonts = function (fontToDetect, baseFont) {
+        var s = createSpan()
+        s.style.fontFamily = "'" + fontToDetect + "'," + baseFont
+        return s
+      }
+
+        // creates spans for the base fonts and adds them to baseFontsDiv
+      var initializeBaseFontsSpans = function () {
+        var spans = []
+        for (var index = 0, length = baseFonts.length; index < length; index++) {
+          var s = createSpan()
+          s.style.fontFamily = baseFonts[index]
+          baseFontsDiv.appendChild(s)
+          spans.push(s)
+        }
+        return spans
+      }
+
+        // creates spans for the fonts to detect and adds them to fontsDiv
+      var initializeFontsSpans = function () {
+        var spans = {}
+        for (var i = 0, l = fontList.length; i < l; i++) {
+          var fontSpans = []
+          for (var j = 0, numDefaultFonts = baseFonts.length; j < numDefaultFonts; j++) {
+            var s = createSpanWithFonts(fontList[i], baseFonts[j])
+            fontsDiv.appendChild(s)
+            fontSpans.push(s)
+          }
+          spans[fontList[i]] = fontSpans // Stores {fontName : [spans for that font]}
+        }
+        return spans
+      }
+
+        // checks if a font is available
+      var isFontAvailable = function (fontSpans) {
+        var detected = false
+        for (var i = 0; i < baseFonts.length; i++) {
+          detected = (fontSpans[i].offsetWidth !== defaultWidth[baseFonts[i]] || fontSpans[i].offsetHeight !== defaultHeight[baseFonts[i]])
+          if (detected) {
+            return detected
+          }
+        }
+        return detected
+      }
+
+        // create spans for base fonts
+      var baseFontsSpans = initializeBaseFontsSpans()
+
+        // add the spans to the DOM
+      h.appendChild(baseFontsDiv)
+
+        // get the default width for the three base fonts
+      for (var index = 0, length = baseFonts.length; index < length; index++) {
+        defaultWidth[baseFonts[index]] = baseFontsSpans[index].offsetWidth // width for the default font
+        defaultHeight[baseFonts[index]] = baseFontsSpans[index].offsetHeight // height for the default font
+      }
+
+        // create spans for fonts to detect
+      var fontsSpans = initializeFontsSpans()
+
+        // add all the spans to the DOM
+      h.appendChild(fontsDiv)
+
+        // check available fonts
+      var available = []
+      for (var i = 0, l = fontList.length; i < l; i++) {
+        if (isFontAvailable(fontsSpans[fontList[i]])) {
+          available.push(fontList[i])
+        }
+      }
+
+        // remove spans from DOM
+      h.removeChild(fontsDiv)
+      h.removeChild(baseFontsDiv)
+      done(available)
+    }
+    var pluginsComponent = function (done, options) {
+      if (isIE()) {
+        if (!options.plugins.excludeIE) {
+          done(getIEPlugins(options))
+        } else {
+          done(options.EXCLUDED)
+        }
+      } else {
+        done(getRegularPlugins(options))
+      }
+    }
+    var getRegularPlugins = function (options) {
+      if (navigator.plugins == null) {
+        return options.NOT_AVAILABLE
+      }
+
+      var plugins = []
+        // plugins isn't defined in Node envs.
+      for (var i = 0, l = navigator.plugins.length; i < l; i++) {
+        if (navigator.plugins[i]) { plugins.push(navigator.plugins[i]) }
+      }
+
+        // sorting plugins only for those user agents, that we know randomize the plugins
+        // every time we try to enumerate them
+      if (pluginsShouldBeSorted(options)) {
+        plugins = plugins.sort(function (a, b) {
+          if (a.name > b.name) { return 1 }
+          if (a.name < b.name) { return -1 }
+          return 0
+        })
+      }
+      return map(plugins, function (p) {
+        var mimeTypes = map(p, function (mt) {
+          return [mt.type, mt.suffixes]
+        })
+        return [p.name, p.description, mimeTypes]
+      })
+    }
+    var getIEPlugins = function (options) {
+      var result = []
+      if ((Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(window, 'ActiveXObject')) || ('ActiveXObject' in window)) {
+        var names = [
+          'AcroPDF.PDF', // Adobe PDF reader 7+
+          'Adodb.Stream',
+          'AgControl.AgControl', // Silverlight
+          'DevalVRXCtrl.DevalVRXCtrl.1',
+          'MacromediaFlashPaper.MacromediaFlashPaper',
+          'Msxml2.DOMDocument',
+          'Msxml2.XMLHTTP',
+          'PDF.PdfCtrl', // Adobe PDF reader 6 and earlier, brrr
+          'QuickTime.QuickTime', // QuickTime
+          'QuickTimeCheckObject.QuickTimeCheck.1',
+          'RealPlayer',
+          'RealPlayer.RealPlayer(tm) ActiveX Control (32-bit)',
+          'RealVideo.RealVideo(tm) ActiveX Control (32-bit)',
+          'Scripting.Dictionary',
+          'SWCtl.SWCtl', // ShockWave player
+          'Shell.UIHelper',
+          'ShockwaveFlash.ShockwaveFlash', // flash plugin
+          'Skype.Detection',
+          'TDCCtl.TDCCtl',
+          'WMPlayer.OCX', // Windows media player
+          'rmocx.RealPlayer G2 Control',
+          'rmocx.RealPlayer G2 Control.1'
+        ]
+          // starting to detect plugins in IE
+        result = map(names, function (name) {
+          try {
+              // eslint-disable-next-line no-new
+            new window.ActiveXObject(name)
+            return name
+          } catch (e) {
+            return options.ERROR
+          }
+        })
+      } else {
+        result.push(options.NOT_AVAILABLE)
+      }
+      if (navigator.plugins) {
+        result = result.concat(getRegularPlugins(options))
+      }
+      return result
+    }
+    var pluginsShouldBeSorted = function (options) {
+      var should = false
+      for (var i = 0, l = options.plugins.sortPluginsFor.length; i < l; i++) {
+        var re = options.plugins.sortPluginsFor[i]
+        if (navigator.userAgent.match(re)) {
+          should = true
+          break
+        }
+      }
+      return should
+    }
+    var touchSupportKey = function (done) {
+      done(getTouchSupport())
+    }
+    var hardwareConcurrencyKey = function (done, options) {
+      done(getHardwareConcurrency(options))
+    }
+    var hasSessionStorage = function (options) {
+      try {
+        return !!window.sessionStorage
+      } catch (e) {
+        return options.ERROR // SecurityError when referencing it means it exists
+      }
+    }
+
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=781447
+    var hasLocalStorage = function (options) {
+      try {
+        return !!window.localStorage
+      } catch (e) {
+        return options.ERROR // SecurityError when referencing it means it exists
+      }
+    }
+    var hasIndexedDB = function (options) {
+      try {
+        return !!window.indexedDB
+      } catch (e) {
+        return options.ERROR // SecurityError when referencing it means it exists
+      }
+    }
+    var getHardwareConcurrency = function (options) {
+      if (navigator.hardwareConcurrency) {
+        return navigator.hardwareConcurrency
+      }
+      return options.NOT_AVAILABLE
+    }
+    var getNavigatorCpuClass = function (options) {
+      return navigator.cpuClass || options.NOT_AVAILABLE
+    }
+    var getNavigatorPlatform = function (options) {
+      if (navigator.platform) {
+        return navigator.platform
+      } else {
+        return options.NOT_AVAILABLE
+      }
+    }
+    var getDoNotTrack = function (options) {
+      if (navigator.doNotTrack) {
+        return navigator.doNotTrack
+      } else if (navigator.msDoNotTrack) {
+        return navigator.msDoNotTrack
+      } else if (window.doNotTrack) {
+        return window.doNotTrack
+      } else {
+        return options.NOT_AVAILABLE
+      }
+    }
+  // This is a crude and primitive touch screen detection.
+  // It's not possible to currently reliably detect the  availability of a touch screen
+  // with a JS, without actually subscribing to a touch event.
+  // http://www.stucox.com/blog/you-cant-detect-a-touchscreen/
+  // https://github.com/Modernizr/Modernizr/issues/548
+  // method returns an array of 3 values:
+  // maxTouchPoints, the success or failure of creating a TouchEvent,
+  // and the availability of the 'ontouchstart' property
+
+    var getTouchSupport = function () {
+      var maxTouchPoints = 0
+      var touchEvent
+      if (typeof navigator.maxTouchPoints !== 'undefined') {
+        maxTouchPoints = navigator.maxTouchPoints
+      } else if (typeof navigator.msMaxTouchPoints !== 'undefined') {
+        maxTouchPoints = navigator.msMaxTouchPoints
+      }
+      try {
+        document.createEvent('TouchEvent')
+        touchEvent = true
+      } catch (_) {
+        touchEvent = false
+      }
+      var touchStart = 'ontouchstart' in window
+      return [maxTouchPoints, touchEvent, touchStart]
+    }
+  // https://www.browserleaks.com/canvas#how-does-it-work
+
+    var getCanvasFp = function (options) {
+      var result = []
+        // Very simple now, need to make it more complex (geo shapes etc)
+      var canvas = document.createElement('canvas')
+      canvas.width = 2000
+      canvas.height = 200
+      canvas.style.display = 'inline'
+      var ctx = canvas.getContext('2d')
+        // detect browser support of canvas winding
+        // http://blogs.adobe.com/webplatform/2013/01/30/winding-rules-in-canvas/
+        // https://github.com/Modernizr/Modernizr/blob/master/feature-detects/canvas/winding.js
+      ctx.rect(0, 0, 10, 10)
+      ctx.rect(2, 2, 6, 6)
+      result.push('canvas winding:' + ((ctx.isPointInPath(5, 5, 'evenodd') === false) ? 'yes' : 'no'))
+
+      ctx.textBaseline = 'alphabetic'
+      ctx.fillStyle = '#f60'
+      ctx.fillRect(125, 1, 62, 20)
+      ctx.fillStyle = '#069'
+        // https://github.com/Valve/fingerprintjs2/issues/66
+      if (options.dontUseFakeFontInCanvas) {
+        ctx.font = '11pt Arial'
+      } else {
+        ctx.font = '11pt no-real-font-123'
+      }
+      ctx.fillText('Cwm fjordbank glyphs vext quiz, \ud83d\ude03', 2, 15)
+      ctx.fillStyle = 'rgba(102, 204, 0, 0.2)'
+      ctx.font = '18pt Arial'
+      ctx.fillText('Cwm fjordbank glyphs vext quiz, \ud83d\ude03', 4, 45)
+
+        // canvas blending
+        // http://blogs.adobe.com/webplatform/2013/01/28/blending-features-in-canvas/
+        // http://jsfiddle.net/NDYV8/16/
+      ctx.globalCompositeOperation = 'multiply'
+      ctx.fillStyle = 'rgb(255,0,255)'
+      ctx.beginPath()
+      ctx.arc(50, 50, 50, 0, Math.PI * 2, true)
+      ctx.closePath()
+      ctx.fill()
+      ctx.fillStyle = 'rgb(0,255,255)'
+      ctx.beginPath()
+      ctx.arc(100, 50, 50, 0, Math.PI * 2, true)
+      ctx.closePath()
+      ctx.fill()
+      ctx.fillStyle = 'rgb(255,255,0)'
+      ctx.beginPath()
+      ctx.arc(75, 100, 50, 0, Math.PI * 2, true)
+      ctx.closePath()
+      ctx.fill()
+      ctx.fillStyle = 'rgb(255,0,255)'
+        // canvas winding
+        // http://blogs.adobe.com/webplatform/2013/01/30/winding-rules-in-canvas/
+        // http://jsfiddle.net/NDYV8/19/
+      ctx.arc(75, 75, 75, 0, Math.PI * 2, true)
+      ctx.arc(75, 75, 25, 0, Math.PI * 2, true)
+      ctx.fill('evenodd')
+
+      if (canvas.toDataURL) { result.push('canvas fp:' + canvas.toDataURL()) }
+      return result
+    }
+    var getWebglFp = function () {
+      var gl
+      var fa2s = function (fa) {
+        gl.clearColor(0.0, 0.0, 0.0, 1.0)
+        gl.enable(gl.DEPTH_TEST)
+        gl.depthFunc(gl.LEQUAL)
+        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT)
+        return '[' + fa[0] + ', ' + fa[1] + ']'
+      }
+      var maxAnisotropy = function (gl) {
+        var ext = gl.getExtension('EXT_texture_filter_anisotropic') || gl.getExtension('WEBKIT_EXT_texture_filter_anisotropic') || gl.getExtension('MOZ_EXT_texture_filter_anisotropic')
+        if (ext) {
+          var anisotropy = gl.getParameter(ext.MAX_TEXTURE_MAX_ANISOTROPY_EXT)
+          if (anisotropy === 0) {
+            anisotropy = 2
+          }
+          return anisotropy
+        } else {
+          return null
+        }
+      }
+
+      gl = getWebglCanvas()
+      if (!gl) { return null }
+        // WebGL fingerprinting is a combination of techniques, found in MaxMind antifraud script & Augur fingerprinting.
+        // First it draws a gradient object with shaders and convers the image to the Base64 string.
+        // Then it enumerates all WebGL extensions & capabilities and appends them to the Base64 string, resulting in a huge WebGL string, potentially very unique on each device
+        // Since iOS supports webgl starting from version 8.1 and 8.1 runs on several graphics chips, the results may be different across ios devices, but we need to verify it.
+      var result = []
+      var vShaderTemplate = 'attribute vec2 attrVertex;varying vec2 varyinTexCoordinate;uniform vec2 uniformOffset;void main(){varyinTexCoordinate=attrVertex+uniformOffset;gl_Position=vec4(attrVertex,0,1);}'
+      var fShaderTemplate = 'precision mediump float;varying vec2 varyinTexCoordinate;void main() {gl_FragColor=vec4(varyinTexCoordinate,0,1);}'
+      var vertexPosBuffer = gl.createBuffer()
+      gl.bindBuffer(gl.ARRAY_BUFFER, vertexPosBuffer)
+      var vertices = new Float32Array([-0.2, -0.9, 0, 0.4, -0.26, 0, 0, 0.732134444, 0])
+      gl.bufferData(gl.ARRAY_BUFFER, vertices, gl.STATIC_DRAW)
+      vertexPosBuffer.itemSize = 3
+      vertexPosBuffer.numItems = 3
+      var program = gl.createProgram()
+      var vshader = gl.createShader(gl.VERTEX_SHADER)
+      gl.shaderSource(vshader, vShaderTemplate)
+      gl.compileShader(vshader)
+      var fshader = gl.createShader(gl.FRAGMENT_SHADER)
+      gl.shaderSource(fshader, fShaderTemplate)
+      gl.compileShader(fshader)
+      gl.attachShader(program, vshader)
+      gl.attachShader(program, fshader)
+      gl.linkProgram(program)
+      gl.useProgram(program)
+      program.vertexPosAttrib = gl.getAttribLocation(program, 'attrVertex')
+      program.offsetUniform = gl.getUniformLocation(program, 'uniformOffset')
+      gl.enableVertexAttribArray(program.vertexPosArray)
+      gl.vertexAttribPointer(program.vertexPosAttrib, vertexPosBuffer.itemSize, gl.FLOAT, !1, 0, 0)
+      gl.uniform2f(program.offsetUniform, 1, 1)
+      gl.drawArrays(gl.TRIANGLE_STRIP, 0, vertexPosBuffer.numItems)
+      try {
+        result.push(gl.canvas.toDataURL())
+      } catch (e) {
+          /* .toDataURL may be absent or broken (blocked by extension) */
+      }
+      result.push('extensions:' + (gl.getSupportedExtensions() || []).join(';'))
+      result.push('webgl aliased line width range:' + fa2s(gl.getParameter(gl.ALIASED_LINE_WIDTH_RANGE)))
+      result.push('webgl aliased point size range:' + fa2s(gl.getParameter(gl.ALIASED_POINT_SIZE_RANGE)))
+      result.push('webgl alpha bits:' + gl.getParameter(gl.ALPHA_BITS))
+      result.push('webgl antialiasing:' + (gl.getContextAttributes().antialias ? 'yes' : 'no'))
+      result.push('webgl blue bits:' + gl.getParameter(gl.BLUE_BITS))
+      result.push('webgl depth bits:' + gl.getParameter(gl.DEPTH_BITS))
+      result.push('webgl green bits:' + gl.getParameter(gl.GREEN_BITS))
+      result.push('webgl max anisotropy:' + maxAnisotropy(gl))
+      result.push('webgl max combined texture image units:' + gl.getParameter(gl.MAX_COMBINED_TEXTURE_IMAGE_UNITS))
+      result.push('webgl max cube map texture size:' + gl.getParameter(gl.MAX_CUBE_MAP_TEXTURE_SIZE))
+      result.push('webgl max fragment uniform vectors:' + gl.getParameter(gl.MAX_FRAGMENT_UNIFORM_VECTORS))
+      result.push('webgl max render buffer size:' + gl.getParameter(gl.MAX_RENDERBUFFER_SIZE))
+      result.push('webgl max texture image units:' + gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS))
+      result.push('webgl max texture size:' + gl.getParameter(gl.MAX_TEXTURE_SIZE))
+      result.push('webgl max varying vectors:' + gl.getParameter(gl.MAX_VARYING_VECTORS))
+      result.push('webgl max vertex attribs:' + gl.getParameter(gl.MAX_VERTEX_ATTRIBS))
+      result.push('webgl max vertex texture image units:' + gl.getParameter(gl.MAX_VERTEX_TEXTURE_IMAGE_UNITS))
+      result.push('webgl max vertex uniform vectors:' + gl.getParameter(gl.MAX_VERTEX_UNIFORM_VECTORS))
+      result.push('webgl max viewport dims:' + fa2s(gl.getParameter(gl.MAX_VIEWPORT_DIMS)))
+      result.push('webgl red bits:' + gl.getParameter(gl.RED_BITS))
+      result.push('webgl renderer:' + gl.getParameter(gl.RENDERER))
+      result.push('webgl shading language version:' + gl.getParameter(gl.SHADING_LANGUAGE_VERSION))
+      result.push('webgl stencil bits:' + gl.getParameter(gl.STENCIL_BITS))
+      result.push('webgl vendor:' + gl.getParameter(gl.VENDOR))
+      result.push('webgl version:' + gl.getParameter(gl.VERSION))
+
+      try {
+          // Add the unmasked vendor and unmasked renderer if the debug_renderer_info extension is available
+        var extensionDebugRendererInfo = gl.getExtension('WEBGL_debug_renderer_info')
+        if (extensionDebugRendererInfo) {
+          result.push('webgl unmasked vendor:' + gl.getParameter(extensionDebugRendererInfo.UNMASKED_VENDOR_WEBGL))
+          result.push('webgl unmasked renderer:' + gl.getParameter(extensionDebugRendererInfo.UNMASKED_RENDERER_WEBGL))
+        }
+      } catch (e) { /* squelch */ }
+
+      if (!gl.getShaderPrecisionFormat) {
+        return result
+      }
+
+      each(['FLOAT', 'INT'], function (numType) {
+        each(['VERTEX', 'FRAGMENT'], function (shader) {
+          each(['HIGH', 'MEDIUM', 'LOW'], function (numSize) {
+            each(['precision', 'rangeMin', 'rangeMax'], function (key) {
+              var format = gl.getShaderPrecisionFormat(gl[shader + '_SHADER'], gl[numSize + '_' + numType])[key]
+              if (key !== 'precision') {
+                key = 'precision ' + key
+              }
+              var line = ['webgl ', shader.toLowerCase(), ' shader ', numSize.toLowerCase(), ' ', numType.toLowerCase(), ' ', key, ':', format].join('')
+              result.push(line)
+            })
+          })
+        })
+      })
+      return result
+    }
+    var getWebglVendorAndRenderer = function () {
+        /* This a subset of the WebGL fingerprint with a lot of entropy, while being reasonably browser-independent */
+      try {
+        var glContext = getWebglCanvas()
+        var extensionDebugRendererInfo = glContext.getExtension('WEBGL_debug_renderer_info')
+        return glContext.getParameter(extensionDebugRendererInfo.UNMASKED_VENDOR_WEBGL) + '~' + glContext.getParameter(extensionDebugRendererInfo.UNMASKED_RENDERER_WEBGL)
+      } catch (e) {
+        return null
+      }
+    }
+    var getAdBlock = function () {
+      var ads = document.createElement('div')
+      ads.innerHTML = '&nbsp;'
+      ads.className = 'adsbox'
+      var result = false
+      try {
+          // body may not exist, that's why we need try/catch
+        document.body.appendChild(ads)
+        result = document.getElementsByClassName('adsbox')[0].offsetHeight === 0
+        document.body.removeChild(ads)
+      } catch (e) {
+        result = false
+      }
+      return result
+    }
+    var getHasLiedLanguages = function () {
+        // We check if navigator.language is equal to the first language of navigator.languages
+      if (typeof navigator.languages !== 'undefined') {
+        try {
+          var firstLanguages = navigator.languages[0].substr(0, 2)
+          if (firstLanguages !== navigator.language.substr(0, 2)) {
+            return true
+          }
+        } catch (err) {
+          return true
+        }
+      }
+      return false
+    }
+    var getHasLiedResolution = function () {
+      return window.screen.width < window.screen.availWidth || window.screen.height < window.screen.availHeight
+    }
+    var getHasLiedOs = function () {
+      var userAgent = navigator.userAgent.toLowerCase()
+      var oscpu = navigator.oscpu
+      var platform = navigator.platform.toLowerCase()
+      var os
+        // We extract the OS from the user agent (respect the order of the if else if statement)
+      if (userAgent.indexOf('windows phone') >= 0) {
+        os = 'Windows Phone'
+      } else if (userAgent.indexOf('win') >= 0) {
+        os = 'Windows'
+      } else if (userAgent.indexOf('android') >= 0) {
+        os = 'Android'
+      } else if (userAgent.indexOf('linux') >= 0) {
+        os = 'Linux'
+      } else if (userAgent.indexOf('iphone') >= 0 || userAgent.indexOf('ipad') >= 0) {
+        os = 'iOS'
+      } else if (userAgent.indexOf('mac') >= 0) {
+        os = 'Mac'
+      } else {
+        os = 'Other'
+      }
+        // We detect if the person uses a mobile device
+      var mobileDevice = (('ontouchstart' in window) ||
+          (navigator.maxTouchPoints > 0) ||
+          (navigator.msMaxTouchPoints > 0))
+
+      if (mobileDevice && os !== 'Windows Phone' && os !== 'Android' && os !== 'iOS' && os !== 'Other') {
+        return true
+      }
+
+        // We compare oscpu with the OS extracted from the UA
+      if (typeof oscpu !== 'undefined') {
+        oscpu = oscpu.toLowerCase()
+        if (oscpu.indexOf('win') >= 0 && os !== 'Windows' && os !== 'Windows Phone') {
+          return true
+        } else if (oscpu.indexOf('linux') >= 0 && os !== 'Linux' && os !== 'Android') {
+          return true
+        } else if (oscpu.indexOf('mac') >= 0 && os !== 'Mac' && os !== 'iOS') {
+          return true
+        } else if ((oscpu.indexOf('win') === -1 && oscpu.indexOf('linux') === -1 && oscpu.indexOf('mac') === -1) !== (os === 'Other')) {
+          return true
+        }
+      }
+
+        // We compare platform with the OS extracted from the UA
+      if (platform.indexOf('win') >= 0 && os !== 'Windows' && os !== 'Windows Phone') {
+        return true
+      } else if ((platform.indexOf('linux') >= 0 || platform.indexOf('android') >= 0 || platform.indexOf('pike') >= 0) && os !== 'Linux' && os !== 'Android') {
+        return true
+      } else if ((platform.indexOf('mac') >= 0 || platform.indexOf('ipad') >= 0 || platform.indexOf('ipod') >= 0 || platform.indexOf('iphone') >= 0) && os !== 'Mac' && os !== 'iOS') {
+        return true
+      } else if ((platform.indexOf('win') === -1 && platform.indexOf('linux') === -1 && platform.indexOf('mac') === -1) !== (os === 'Other')) {
+        return true
+      }
+
+      return typeof navigator.plugins === 'undefined' && os !== 'Windows' && os !== 'Windows Phone'
+    }
+    var getHasLiedBrowser = function () {
+      var userAgent = navigator.userAgent.toLowerCase()
+      var productSub = navigator.productSub
+
+        // we extract the browser from the user agent (respect the order of the tests)
+      var browser
+      if (userAgent.indexOf('firefox') >= 0) {
+        browser = 'Firefox'
+      } else if (userAgent.indexOf('opera') >= 0 || userAgent.indexOf('opr') >= 0) {
+        browser = 'Opera'
+      } else if (userAgent.indexOf('chrome') >= 0) {
+        browser = 'Chrome'
+      } else if (userAgent.indexOf('safari') >= 0) {
+        browser = 'Safari'
+      } else if (userAgent.indexOf('trident') >= 0) {
+        browser = 'Internet Explorer'
+      } else {
+        browser = 'Other'
+      }
+
+      if ((browser === 'Chrome' || browser === 'Safari' || browser === 'Opera') && productSub !== '20030107') {
+        return true
+      }
+
+        // eslint-disable-next-line no-eval
+      var tempRes = eval.toString().length
+      if (tempRes === 37 && browser !== 'Safari' && browser !== 'Firefox' && browser !== 'Other') {
+        return true
+      } else if (tempRes === 39 && browser !== 'Internet Explorer' && browser !== 'Other') {
+        return true
+      } else if (tempRes === 33 && browser !== 'Chrome' && browser !== 'Opera' && browser !== 'Other') {
+        return true
+      }
+
+        // We create an error to see how it is handled
+      var errFirefox
+      try {
+          // eslint-disable-next-line no-throw-literal
+        throw 'a'
+      } catch (err) {
+        try {
+          err.toSource()
+          errFirefox = true
+        } catch (errOfErr) {
+          errFirefox = false
+        }
+      }
+      return errFirefox && browser !== 'Firefox' && browser !== 'Other'
+    }
+    var isCanvasSupported = function () {
+      var elem = document.createElement('canvas')
+      return !!(elem.getContext && elem.getContext('2d'))
+    }
+    var isWebGlSupported = function () {
+        // code taken from Modernizr
+      if (!isCanvasSupported()) {
+        return false
+      }
+
+      var glContext = getWebglCanvas()
+      return !!window.WebGLRenderingContext && !!glContext
+    }
+    var isIE = function () {
+      if (navigator.appName === 'Microsoft Internet Explorer') {
+        return true
+      } else if (navigator.appName === 'Netscape' && /Trident/.test(navigator.userAgent)) { // IE 11
+        return true
+      }
+      return false
+    }
+    var hasSwfObjectLoaded = function () {
+      return typeof window.swfobject !== 'undefined'
+    }
+    var hasMinFlashInstalled = function () {
+      return window.swfobject.hasFlashPlayerVersion('9.0.0')
+    }
+    var addFlashDivNode = function (options) {
+      var node = document.createElement('div')
+      node.setAttribute('id', options.fonts.swfContainerId)
+      document.body.appendChild(node)
+    }
+    var loadSwfAndDetectFonts = function (done, options) {
+      var hiddenCallback = '___fp_swf_loaded'
+      window[hiddenCallback] = function (fonts) {
+        done(fonts)
+      }
+      var id = options.fonts.swfContainerId
+      addFlashDivNode()
+      var flashvars = { onReady: hiddenCallback }
+      var flashparams = { allowScriptAccess: 'always', menu: 'false' }
+      window.swfobject.embedSWF(options.fonts.swfPath, id, '1', '1', '9.0.0', false, flashvars, flashparams, {})
+    }
+    var getWebglCanvas = function () {
+      var canvas = document.createElement('canvas')
+      var gl = null
+      try {
+        gl = canvas.getContext('webgl') || canvas.getContext('experimental-webgl')
+      } catch (e) { /* squelch */ }
+      if (!gl) { gl = null }
+      return gl
+    }
+
+    var components = [
+      {key: 'userAgent', getData: UserAgent},
+      {key: 'language', getData: languageKey},
+      {key: 'colorDepth', getData: colorDepthKey},
+      {key: 'deviceMemory', getData: deviceMemoryKey},
+      {key: 'pixelRatio', getData: pixelRatioKey},
+      {key: 'hardwareConcurrency', getData: hardwareConcurrencyKey},
+      {key: 'screenResolution', getData: screenResolutionKey},
+      {key: 'availableScreenResolution', getData: availableScreenResolutionKey},
+      {key: 'timezoneOffset', getData: timezoneOffset},
+      {key: 'timezone', getData: timezone},
+      {key: 'sessionStorage', getData: sessionStorageKey},
+      {key: 'localStorage', getData: localStorageKey},
+      {key: 'indexedDb', getData: indexedDbKey},
+      {key: 'addBehavior', getData: addBehaviorKey},
+      {key: 'openDatabase', getData: openDatabaseKey},
+      {key: 'cpuClass', getData: cpuClassKey},
+      {key: 'platform', getData: platformKey},
+      {key: 'doNotTrack', getData: doNotTrackKey},
+      {key: 'plugins', getData: pluginsComponent},
+      {key: 'canvas', getData: canvasKey},
+      {key: 'webgl', getData: webglKey},
+      {key: 'webglVendorAndRenderer', getData: webglVendorAndRendererKey},
+      {key: 'adBlock', getData: adBlockKey},
+      {key: 'hasLiedLanguages', getData: hasLiedLanguagesKey},
+      {key: 'hasLiedResolution', getData: hasLiedResolutionKey},
+      {key: 'hasLiedOs', getData: hasLiedOsKey},
+      {key: 'hasLiedBrowser', getData: hasLiedBrowserKey},
+      {key: 'touchSupport', getData: touchSupportKey},
+      {key: 'fonts', getData: jsFontsKey, pauseBefore: true},
+      {key: 'fontsFlash', getData: flashFontsKey, pauseBefore: true},
+      {key: 'audio', getData: audioKey},
+      {key: 'enumerateDevices', getData: enumerateDevicesKey}
+    ]
+
+    var Fingerprint2 = function (options) {
+      throw new Error("'new Fingerprint()' is deprecated, see https://github.com/Valve/fingerprintjs2#upgrade-guide-from-182-to-200")
+    }
+
+    Fingerprint2.get = function (options, callback) {
+      if (!callback) {
+        callback = options
+        options = {}
+      } else if (!options) {
+        options = {}
+      }
+      extendSoft(options, defaultOptions)
+      options.components = options.extraComponents.concat(components)
+
+      var keys = {
+        data: [],
+        addPreprocessedComponent: function (key, value) {
+          if (typeof options.preprocessor === 'function') {
+            value = options.preprocessor(key, value)
+          }
+          keys.data.push({key: key, value: value})
+        }
+      }
+
+      var i = -1
+      var chainComponents = function (alreadyWaited) {
+        i += 1
+        if (i >= options.components.length) { // on finish
+          callback(keys.data)
+          return
+        }
+        var component = options.components[i]
+
+        if (options.excludes[component.key]) {
+          chainComponents(false) // skip
+          return
+        }
+
+        if (!alreadyWaited && component.pauseBefore) {
+          i -= 1
+          setTimeout(function () {
+            chainComponents(true)
+          }, 1)
+          return
+        }
+
+        try {
+          component.getData(function (value) {
+            keys.addPreprocessedComponent(component.key, value)
+            chainComponents(false)
+          }, options)
+        } catch (error) {
+          // main body error
+          keys.addPreprocessedComponent(component.key, String(error))
+          chainComponents(false)
+        }
+      }
+
+      chainComponents(false)
+    }
+
+    Fingerprint2.getPromise = function (options) {
+      return new Promise(function (resolve, reject) {
+        Fingerprint2.get(options, resolve)
+      })
+    }
+
+    Fingerprint2.getV18 = function (options, callback) {
+      if (callback == null) {
+        callback = options
+        options = {}
+      }
+      return Fingerprint2.get(options, function (components) {
+        var newComponents = []
+        for (var i = 0; i < components.length; i++) {
+          var component = components[i]
+          if (component.value === (options.NOT_AVAILABLE || 'not available')) {
+            newComponents.push({key: component.key, value: 'unknown'})
+          } else if (component.key === 'plugins') {
+            newComponents.push({key: 'plugins',
+              value: map(component.value, function (p) {
+                var mimeTypes = map(p[2], function (mt) {
+                  if (mt.join) { return mt.join('~') }
+                  return mt
+                }).join(',')
+                return [p[0], p[1], mimeTypes].join('::')
+              })})
+          } else if (['canvas', 'webgl'].indexOf(component.key) !== -1) {
+            newComponents.push({key: component.key, value: component.value.join('~')})
+          } else if (['sessionStorage', 'localStorage', 'indexedDb', 'addBehavior', 'openDatabase'].indexOf(component.key) !== -1) {
+            if (component.value) {
+              newComponents.push({key: component.key, value: 1})
+            } else {
+              // skip
+              continue
+            }
+          } else {
+            if (component.value) {
+              newComponents.push(component.value.join ? {key: component.key, value: component.value.join(';')} : component)
+            } else {
+              newComponents.push({key: component.key, value: component.value})
+            }
+          }
+        }
+        var murmur = x64hash128(map(newComponents, function (component) { return component.value }).join('~~~'), 31)
+        callback(murmur, newComponents)
+      })
+    }
+
+    Fingerprint2.x64hash128 = x64hash128
+    Fingerprint2.VERSION = '2.0.6'
+    return Fingerprint2
+  })
+/**
+ * This is responsible for syncing of Telemetry
+ * @class TelemetrySyncManager
+ * @author Manjunath Davanam <manjunathd@ilimi.in>
+ * @author Krushanu Mohapatra <Krushanu.Mohapatra@tarento.com>
+ */
+
+var TelemetrySyncManager = {
+
+    /**
+     * This is the telemetry data for the perticular stage.
+     * @member {object} _teleData
+     * @memberof TelemetryPlugin
+     */
+    _teleData: [],
+    init: function() {
+        var instance = this;
+        document.addEventListener('TelemetryEvent', this.sendTelemetry);
+    },
+    sendTelemetry: function(event) {
+        var telemetryEvent = event.detail;
+        console.log("Telemetry Events ", JSON.stringify(telemetryEvent));
+        var instance = TelemetrySyncManager;
+        sessionStorage.setItem("FP_T", window.EkTelemetry.fingerPrintId);
+        instance._teleData.push(Object.assign({}, telemetryEvent));
+        if ((telemetryEvent.eid.toUpperCase() === "END") || (instance._teleData.length >= Telemetry.config.batchsize)) {
+            TelemetrySyncManager.syncEvents();
+        }
+    },
+    updateEventStack: function(events) {
+        TelemetrySyncManager._teleData = TelemetrySyncManager._teleData.concat(events);
+    },
+    syncEvents: function() {
+        var Telemetry = EkTelemetry || Telemetry;
+        var instance = TelemetrySyncManager;
+        var telemetryData = instance._teleData.splice(0, Telemetry.config.batchsize);
+        var telemetryObj = {
+            "id": "ekstep.telemetry",
+            "ver": Telemetry._version,
+            "ets": (new Date()).getTime(),
+            "events": telemetryData
+        };
+        var headersParam = {};
+        if ('undefined' != typeof Telemetry.config.authtoken)
+            headersParam["Authorization"] = 'Bearer ' + Telemetry.config.authtoken;
+
+        var fullPath = Telemetry.config.host + Telemetry.config.apislug + Telemetry.config.endpoint;
+        headersParam['dataType'] = 'json';
+        headersParam["Content-Type"] = "application/json";
+        jQuery.ajax({
+            url: fullPath,
+            type: "POST",
+            headers: headersParam,
+            data: JSON.stringify(telemetryObj)
+        }).done(function(resp) {
+            console.log("Telemetry API success", resp);
+        }).fail(function(error, textStatus, errorThrown) {
+            instance.updateEventStack(telemetryData);
+            if (error.status == 403) {
+                console.error("Authentication error: ", error);
+            } else {
+                console.log("Error while Telemetry sync to server: ", error);
+            }
+        });
+    }
+}
+if (typeof document != 'undefined') {
+    TelemetrySyncManager.init();
+}
+/**
+ * Telemetry V3 Library
+ * @author Manjunath Davanam <manjunathd@ilimi.in>
+ * @author Akash Gupta <Akash.Gupta@tarento.com>
+ */
+
+// To support for node server environment
+if (typeof require === "function") {
+    var Ajv = require('ajv')
+}
+
+
+var libraryDispatcher = {
+    dispatch: function(event) {
+        if (typeof document != 'undefined') {
+            //To Support for external user who ever lisenting on this 'TelemetryEvent' event.
+            // IT  WORKS ONLY FOR CLIENT SIDE
+            document.dispatchEvent(new CustomEvent('TelemetryEvent', { detail: event }));
+        } else {
+            console.info("Library dispatcher supports only for client side.");
+        }
+    }
+};
+
+
+var Telemetry = (function() {
+    this.telemetry = function() {};
+    var instance = function() {};
+    var telemetryInstance = this;
+    this.telemetry.initialized = false;
+    this.telemetry.config = {};
+    this.telemetry._version = "3.0";
+    this.telemetry.fingerPrintId = undefined;
+    this.dispatcher = libraryDispatcher;
+    this._defaultValue = {
+            uid: "anonymous",
+            authtoken: "",
+            batchsize: 20,
+            host: "https://api.ekstep.in",
+            endpoint: "/data/v3/telemetry",
+            apislug: "/action",
+        },
+        this.telemetryEnvelop = {
+            "eid": "",
+            "ets": "",
+            "ver": "",
+            "mid": '',
+            "actor": {},
+            "context": {},
+            "object": {},
+            "tags": [],
+            "edata": ""
+        }
+    this._globalContext = {
+        "channel": 'in.ekstep',
+        "pdata": { id: "in.ekstep", ver: "1.0", pid: "" },
+        "env": "contentplayer",
+        "sid": "",
+        "did": "",
+        "cdata": [],
+        "rollup": {}
+    };
+    this.runningEnv = 'client';
+    this.enableValidation = false;
+    this._globalObject = {};
+    this.startData = [];
+    this.ajv = new Ajv({ schemas: telemetrySchema });
+
+    /**
+     * Which is used to initialize the telemetry event
+     * @param  {object} config - Configurations for the telemetry lib to initialize the service. " Example: config = { batchsize:10,host:"" } "
+     */
+    this.telemetry.initialize = function(config) {
+        instance.init(config);
+    }
+
+    /**
+     * Which is used to start and initialize the telemetry event.
+     * If the telemetry is already initialzed then it will trigger only start event.
+     * @param  {object} config     [Telemetry lib configurations]
+     * @param  {string} contentId  [Content Identifier]
+     * @param  {string} contentVer [Content version]
+     * @param  {object} data       [Can have userAgent,device spec object]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.start = function(config, contentId, contentVer, data, options) {
+        data.duration = data.duration || (((new Date()).getTime()) * 0.001); // Converting duration miliSeconds to seconds
+        if (contentId && contentVer) {
+            telemetryInstance._globalObject.id = contentId;
+            telemetryInstance._globalObject.ver = contentVer;
+        }
+
+        if (!Telemetry.initialized && config) {
+            instance.init(config, contentId, contentVer)
+
+        }
+        instance.updateValues(options);
+        var startEventObj = instance.getEvent('START', data);
+        instance._dispatch(startEventObj)
+        telemetryInstance.startData.push(JSON.parse(JSON.stringify(startEventObj)));
+    }
+
+    /**
+     * Which is used to log the impression telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.impression = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('IMPRESSION', data));
+    }
+
+    /**
+     * Which is used to log the interact telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.interact = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('INTERACT', data));
+    }
+
+    /**
+     * Which is used to log the assess telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.assess = function(data, options) {
+        instance.updateValues(options);
+        assessEvent = instance.getEvent('ASSESS', data);
+        // This code will replace current version with the new version number, if present in options.
+        if (options && options.eventVer) assessEvent.ver = options.eventVer;
+        instance._dispatch(assessEvent);
+    }
+
+    /**
+     * Which is used to log the response telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.response = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('RESPONSE', data));
+    }
+
+    /**
+     * Which is used to log the interrupt telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.interrupt = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('INTERRUPT', data));
+    }
+
+    /**
+     * Which is used to log the feedback telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.feedback = function(data, options) {
+        var eksData = {
+            "rating": data.rating,
+            "comments": data.comments || ''
+        }
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('FEEDBACK', eksData));
+    }
+
+    /**
+     * Which is used to log the share telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.share = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('SHARE', data));
+    }
+
+    /**
+     * Which is used to log the audit telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.audit = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('AUDIT', data));
+    }
+
+    /**
+     * Which is used to log the error telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.error = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('ERROR', data));
+    }
+
+    /**
+     * Which is used to log the heartbeat telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.heartbeat = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('HEARTBEAT', data));
+    }
+
+    /**
+     * Which is used to log the log event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.log = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('LOG', data));
+    }
+
+    /**
+     * Which is used to log the search event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.search = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('SEARCH', data));
+    }
+
+    /**
+     * Which is used to log the metrics event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.metrics = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('METRICS', data));
+    }
+
+    /**
+     * Which is used to log the exdata event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.exdata = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('EXDATA', data));
+    }
+
+    /**
+     * Which is used to log the summary event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.summary = function(data, options) {
+        instance.updateValues(options);
+        instance._dispatch(instance.getEvent('SUMMARY', data));
+    }
+
+    /**
+     * Which is used to log the end telemetry event.
+     * @param  {object} data       [data which is need to pass in this event ex: {"type":"player","mode":"ContentPlayer","pageid":"splash"}]
+     * @param  {object} options    [It can have `context, object, actor` can be explicitly passed in this event]
+     */
+    this.telemetry.end = function(data, options) {
+        if (telemetryInstance.startData.length) {
+            var startEventObj = telemetryInstance.startData.pop();
+            data.duration = ((new Date()).getTime() - startEventObj.ets) * 0.001; // Converting duration miliSeconds to seconds
+            instance.updateValues(options);
+            instance._dispatch(instance.getEvent('END', data));
+        } else {
+            console.info("Please invoke start before invoking end event.")
+        }
+    }
+
+    /**
+     * Which is used to know the whether telemetry is initialized or not.
+     * @return {Boolean}
+     */
+    this.telemetry.isInitialized = function() {
+        return Telemetry.initialized;
+    }
+
+    /**
+     * Which is used to reset the current context
+     * @param  {object} context [Context value]
+     */
+    this.telemetry.resetContext = function(context) {
+        telemetryInstance._currentContext = context || {};
+    }
+
+    /**
+     * Which is used to reset the current object value.
+     * @param  {object} object [Object value]
+     */
+    this.telemetry.resetObject = function(object) {
+            telemetryInstance._currentObject = object || {};
+        },
+
+        /**
+         * Which is used to reset the current actor value.
+         * @param  {object} object [Object value]
+         */
+        this.telemetry.resetActor = function(actor) {
+            telemetryInstance._currentActor = actor || {};
+        }
+
+
+    /**
+     * Which is used to reset the current actor value.
+     * @param  {object} object [Object value]
+     */
+    this.telemetry.resetTags = function(tags) {
+        telemetryInstance._currentTags = tags || [];
+    }
+
+    this.telemetry.syncEvents = function() {
+        if (typeof TelemetrySyncManager != 'undefined') {
+            TelemetrySyncManager.syncEvents();
+        }
+    }
+
+    /**
+     * Which is used to initialize the telemetry in globally.
+     * @param  {object} config     [Telemetry configurations]
+     * @param  {string} contentId  [Identifier value]
+     * @param  {string} contentVer [Version]
+     * @param  {object} type       [object type]
+     */
+    instance.init = function(config, contentId, contentVer) {
+        if (Telemetry.initialized) {
+            console.log("Telemetry is already initialized..");
+            return;
+        }!config && (config = {})
+        contentId && (telemetryInstance._globalObject.id = contentId);
+        contentVer && (telemetryInstance._globalObject.ver = contentVer);
+        config.runningEnv && (telemetryInstance.runningEnv = config.runningEnv);
+        if (typeof config.enableValidation !== 'undefined') {
+            telemetryInstance.enableValidation = config.enableValidation;
+        }
+        config.batchsize = config.batchsize ? (config.batchsize > 1000 ? 1000 : config.batchsize) : _defaultValue.batchsize;
+        Telemetry.config = Object.assign(_defaultValue, config);
+        Telemetry.initialized = true;
+        telemetryInstance.dispatcher = Telemetry.config.dispatcher ? Telemetry.config.dispatcher : libraryDispatcher;
+        instance.updateConfigurations(config);
+        console.info("Telemetry is initialized.")
+    }
+
+    /**
+     * Which is used to dispatch a telemetry events.
+     * @param  {object} message [Telemetry event object]
+     */
+    instance._dispatch = function(message) {
+        message.mid = message.eid + ':' + CryptoJS.MD5(JSON.stringify(message)).toString();
+        if (telemetryInstance.enableValidation) {
+            var validate = ajv.getSchema('http://api.ekstep.org/telemetry/' + message.eid.toLowerCase())
+            var valid = validate(message)
+            if (!valid) {
+                console.error('Invalid ' + message.eid + ' Event: ' + ajv.errorsText(validate.errors))
+                return
+            }
+        }
+        if (telemetryInstance.runningEnv === 'client') {
+            if (!message.context.did) {
+                if (!Telemetry.fingerPrintId) {
+                    Telemetry.getFingerPrint(function(result, components) {
+                        message.context.did = result;
+                        message.actor.id = instance.getActorId(message.actor.id, result);
+                        Telemetry.fingerPrintId = result;
+                        dispatcher.dispatch(message);
+                    })
+                } else {
+                    message.context.did = Telemetry.fingerPrintId;
+                    message.actor.id = instance.getActorId(message.actor.id, Telemetry.fingerPrintId);
+                    dispatcher.dispatch(message);
+                }
+            } else {
+                message.actor.id = instance.getActorId(message.actor.id, message.context.did);
+                dispatcher.dispatch(message);
+            }
+        } else {
+            dispatcher.dispatch(message);
+        }
+    }
+
+    /**
+     * Which is used to get set Actor id as device id if actor id is 'anonymous'
+     * @param  {string} actorId
+     * @param  {string} deviceId    [DeviceId]
+     * @return {string} [actor id based on value of the actor came from input]
+     */
+    instance.getActorId = function (actorId,deviceId) {
+        if(!actorId || actorId === 'anonymous'){
+            return deviceId;
+        }else{
+            return actorId
+        }
+    }
+
+    /**
+     * Which is used to get the telemetry envelop data
+     * @param  {string} eventId [Name of the event]
+     * @param  {object} data    [Event data]
+     * @return {object}         [Telemetry envelop data]
+     */
+    instance.getEvent = function(eventId, data) {
+        telemetryInstance.telemetryEnvelop.eid = eventId;
+        // timeDiff (in sec) is diff of server date and local date
+        telemetryInstance.telemetryEnvelop.ets = (new Date()).getTime() + ((Telemetry.config.timeDiff*1000) || 0);
+        telemetryInstance.telemetryEnvelop.ver = Telemetry._version;
+        telemetryInstance.telemetryEnvelop.mid = '';
+        telemetryInstance.telemetryEnvelop.actor = Object.assign({}, { "id": Telemetry.config.uid || 'anonymous', "type": 'User' }, instance.getUpdatedValue('actor'));
+        telemetryInstance.telemetryEnvelop.context = Object.assign({}, instance.getGlobalContext(), instance.getUpdatedValue('context'));
+        telemetryInstance.telemetryEnvelop.object = Object.assign({}, instance.getGlobalObject(), instance.getUpdatedValue('object'));
+        telemetryInstance.telemetryEnvelop.tags = Object.assign([], Telemetry.config.tags, instance.getUpdatedValue('tags'));
+        telemetryInstance.telemetryEnvelop.edata = data;
+        return telemetryInstance.telemetryEnvelop;
+    }
+
+    /**
+     * Which is used to assing to globalObject and globalContext value from the telemetry configurations.
+     * @param  {object} config [Telemetry configurations]
+     */
+    instance.updateConfigurations = function(config) {
+        config.object && (telemetryInstance._globalObject = config.object);
+        config.channel && (telemetryInstance._globalContext.channel = config.channel);
+        config.env && (telemetryInstance._globalContext.env = config.env);
+        config.rollup && (telemetryInstance._globalContext.rollup = config.rollup);
+        config.sid && (telemetryInstance._globalContext.sid = config.sid);
+        config.did && (telemetryInstance._globalContext.did = config.did);
+        config.cdata && (telemetryInstance._globalContext.cdata = config.cdata);
+        config.pdata && (telemetryInstance._globalContext.pdata = config.pdata);
+
+
+    }
+
+    /**
+     * Which is used to get the current updated global context value.
+     * @return {object}
+     */
+    instance.getGlobalContext = function() {
+        return telemetryInstance._globalContext;
+    }
+
+    /**
+     * Which is used to get the current global object value.
+     * @return {object}
+     */
+    instance.getGlobalObject = function() {
+        return telemetryInstance._globalObject;
+    }
+
+    /**
+     * Which is used to update the both context and object vlaue.
+     * For any event explicitly context and object value can be passed.
+     * @param  {object} context [Context value object]
+     * @param  {object} object  [Object value]
+     */
+    instance.updateValues = function(options) {
+        if (options) {
+            options.context && (telemetryInstance._currentContext = options.context);
+            options.object && (telemetryInstance._currentObject = options.object);
+            options.actor && (telemetryInstance._currentActor = options.actor);
+            options.tags && (telemetryInstance._currentTags = options.tags);
+            options.runningEnv && (telemetryInstance.runningEnv = options.runningEnv);
+        }
+    }
+
+    /**
+     * Which is used to get the value of 'context','actor','object'
+     * @param  {string} key [ Name of object which we is need to get ]
+     * @return {object}
+     */
+    instance.getUpdatedValue = function(key) {
+        switch (key.toLowerCase()) {
+            case 'context':
+                return telemetryInstance._currentContext || {};
+                break;
+            case 'object':
+                return telemetryInstance._currentObject || {};
+                break;
+            case 'actor':
+                return telemetryInstance._currentActor || {};
+                break;
+            case 'tags':
+                return telemetryInstance._currentTags || [];
+                break;
+        }
+    }
+
+    /**
+     * Which is used to support for lower end deviecs.
+     * If any of the devices which is not supporting ECMAScript 6 version
+     */
+    instance.objectAssign = function() {
+        Object.assign = function(target) {
+            'use strict';
+            if (target == null) {
+                throw new TypeError('Cannot convert undefined or null to object');
+            }
+
+            target = Object(target);
+            for (var index = 1; index < arguments.length; index++) {
+                var source = arguments[index];
+                if (source != null) {
+                    for (var key in source) {
+                        if (Object.prototype.hasOwnProperty.call(source, key)) {
+                            target[key] = source[key];
+                        }
+                    }
+                }
+            }
+            return target;
+        }
+    }
+    var FPoptions = {
+        preprocessor: function (key, value) {
+            if (key == "userAgent") {
+                var parser = new UAParser(value); // https://github.com/faisalman/ua-parser-js
+                var userAgentMinusVersion = parser.getOS().name + ' ' + parser.getBrowser().name
+                return userAgentMinusVersion
+            }
+            return value
+        },
+        audio: {
+            timeout: 1000,
+            // On iOS 11, audio context can only be used in response to user interaction.
+            // We require users to explicitly enable audio fingerprinting on iOS 11.
+            // See https://stackoverflow.com/questions/46363048/onaudioprocess-not-called-on-ios11#46534088
+            excludeIOS11: true
+        },
+        fonts: {
+            swfContainerId: 'fingerprintjs2',
+            swfPath: 'flash/compiled/FontList.swf',
+            userDefinedFonts: [],
+            extendedJsFonts: false
+        },
+        screen: {
+            // To ensure consistent fingerprints when users rotate their mobile devices
+            detectScreenOrientation: true
+        },
+        plugins: {
+            sortPluginsFor: [/palemoon/i],
+            excludeIE: false
+        },
+        extraComponents: [],
+        excludes: {
+            // Unreliable on Windows, see https://github.com/Valve/fingerprintjs2/issues/375
+            'enumerateDevices': true,
+            // devicePixelRatio depends on browser zoom, and it's impossible to detect browser zoom
+            'pixelRatio': true,
+            // DNT depends on incognito mode for some browsers (Chrome) and it's impossible to detect incognito mode
+            'doNotTrack': true,
+            // uses js fonts already
+            'fontsFlash': true,
+            'canvas': true,
+            'screenResolution': true,
+            'availableScreenResolution': true,
+            'touchSupport': true,
+            'plugins': true,
+            'webgl': true,
+            'audio': true,
+            'language': true,
+            'deviceMemory': true
+        },
+        NOT_AVAILABLE: 'not available',
+        ERROR: 'error',
+        EXCLUDED: 'excluded'
+    }
+    this.telemetry.getFingerPrint = function (cb) {
+        Fingerprint2.getV18(FPoptions, function (result, components) {
+            if (cb) cb(result, components)
+        })
+    }
+    if (typeof Object.assign != 'function') {
+        instance.objectAssign();
+    }
+
+    return this.telemetry;
+})();
+
+/**
+ * Name space which is being fallowed
+ * @type {[type]}
+ */
+
+EkTelemetry = $t = Telemetry;
+
+
+
+/**
+ * To support for the node backEnd, So any node developer can import this telemetry lib.
+ */
+if (typeof module != 'undefined') {
+    module.exports = Telemetry;
+}
+
+let pdataId = "";
+if (window.location.origin.indexOf("diksha.gov.in") >= 0) {
+  pdataId = "prod.diksha.portal";
+} else if (window.location.origin.indexOf("staging.ntp.net.in") >= 0) {
+  pdataId = "staging.diksha.portal";
+} else if (window.location.origin.indexOf("staging.sunbirded.org") >= 0) {
+  pdataId = "staging.diksha.portal";
+} else if (window.location.origin.indexOf("dev.sunbirded.org") >= 0) {
+  pdataId = "dev.sunbird.portal";
+} else {
+  pdataId = "preprod.diksha.portal";
+}
+
+let curUrlObj = window.location;
+let client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+if(client_id.toLowerCase() === 'android'){
+  let pdata = JSON.parse((new URLSearchParams(curUrlObj.search)).get('pdata'));
+  if (pdata && pdata['id']) {
+    pdataId = pdata['id'];
+  }
+}
+
+// var tenant_telemetryservice = {};
+//(function () {
+  window.__landing_page_config = {
+    "hostURL": window.location.origin,
+    "telemetry": {
+      "pdata": {
+        "id": pdataId,
+        "ver": "3.5.0",
+        "pid": "sunbird-portal"
+      }
+    }
+  }
+  var tenantId, tenantInfo, orgInfo;
+  var hostURL = window.__landing_page_config.hostURL || null;
+  if (hostURL.indexOf("merge.") > 0) {
+    var url = (window.location.protocol) + "//" + hostURL.slice(hostURL.indexOf("merge.") + 6, hostURL.length);
+    hostURL = url;
+  }
+  function OnLoad() {
+    tenantId = sessionStorage.getItem("tenantSlug") || 'sunbird';
+    getOrgInfo(tenantId).done(function () {
+      initTelemetryService();
+      logLoginImpressionEvent("init");
+    });
+  }
+
+  function getOrgInfo(id) {
+    return $.ajax({
+      method: "POST",
+      url: hostURL + "/api/org/v1/search",
+      data: JSON.stringify({
+        request: {
+          filters: {
+            isRootOrg: true,
+            slug: id || 'ntp'
+          }
+        }
+      }),
+      contentType: "application/json"
+    }).done(function (response) {
+      if (response && response.responseCode === "OK") {
+        orgInfo = response.result.response.content[0];
+        //orgInfo.hashTagId = orgInfo.hashTagId;
+      }
+    });
+    //orgInfo.hashTagId = orgInfo.hashTagId;
+  };
+
+  function getAnonymousUserConfig() {
+    var endpoint = "/data/v1/telemetry"
+    return {
+      pdata: window.__landing_page_config.telemetry.pdata,
+      endpoint: endpoint,
+      apislug: "/content",
+      host: hostURL,
+      uid: 'anonymous',
+      sid: window.uuidv1(),
+      channel: orgInfo.hashTagId,
+      env: 'public'
+    }
+  }
+
+  function initTelemetryService() {
+    var config = getAnonymousUserConfig();
+    window.EkTelemetry.initialize(config);
+  }
+
+  function logLoginImpressionEvent(impressionType) {
+    Telemetry.config.batchsize = 1;
+    var options = {
+      context: {
+        env: 'public',
+        channel: orgInfo.hashTagId,
+        uid: 'anonymous',
+        cdata: [],
+        rollup: getRollupData([orgInfo.hashTagId])
+      },
+      object: {},
+      tags: [orgInfo.hashTagId]
+    };
+    var edata = {
+      type: "view",
+      pageid: "login",
+      subtype: impressionType,
+      uri: encodeURI(window.location.href),
+      visits: []
+    };
+    window.EkTelemetry.impression(edata, options);
+  }
+
+  function logInteractEvent(interactid) {
+    var options = {
+      context: {
+        env: 'public',
+        channel: orgInfo.hashTagId,
+        uid: 'anonymous',
+        cdata: [],
+        rollup: getRollupData([orgInfo.hashTagId])
+      },
+      object: {},
+      tags: [orgInfo.hashTagId]
+    };
+    var edata = {
+      id: interactid,
+      type: "click",
+      pageid: 'login'
+    };
+    window.EkTelemetry.interact(edata, options);
+  };
+
+  function getRollupData(orgIds) {
+    var rollup = {};
+    orgIds.forEach(function (el, index) {
+      rollup['l' + (index + 1)] = el;
+    })
+    return rollup;
+  }
+
+  function doLogin(e) {
+    e.preventDefault();
+    logInteractEvent("login");
+    logLoginImpressionEvent("pageexit");
+    setTimeout(function () {
+      $("#kc-form-login").submit();
+    }, 500);
+    return false;
+  }
+
+  $("body").ready(function ($) {
+    $(".loginButton").click(function (e) {
+      e.preventDefault();
+      logInteractEvent("login");
+      logLoginImpressionEvent("pageexit");
+      setTimeout(function () {
+        $("#kc-form-login").submit();
+      }, 500);
+
+      return false;
+    })
+
+    // onclick="redirect('/google/auth')"
+    $(".googleSignInButton").click(function (e) {
+      e.preventDefault();
+      logInteractEvent("google-signin");
+      redirect('/google/auth');
+      // setTimeout(function(){
+      //   $("#kc-form-login").submit();
+      //  }, 500);
+
+      return false;
+    })
+
+    //onclick="handleSsoEvent()"
+    $(".stateSignInButton").click(function (e) {
+      e.preventDefault();
+      logInteractEvent("state-signin");
+      handleSsoEvent();
+    })
+  });
+
+  //google-signin
+  //state-signin
+
+  function getRollupData(orgIds) {
+    var rollup = {};
+    orgIds.forEach(function (el, index) {
+      rollup['l' + (index + 1)] = el;
+    })
+    return rollup;
+  }
+
+  // On page load
+  OnLoad();
+
+  function getQueryStringValue (key) {
+    return decodeURIComponent(window.location.search.replace(new RegExp("^(?:.*[&\\?]" + encodeURIComponent(key).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1"));
+  }
+
+  window.onload = function(){
+    var mergeaccountprocess = (new URLSearchParams(window.location.search)).get('mergeaccountprocess');
+    var version = getValueFromSession('version');
+    var isForgetPasswordAllow = getValueFromSession('version');
+    var renderingType = 'queryParams';
+    if (!mergeaccountprocess) {
+        mergeaccountprocess = localStorage.getItem('mergeaccountprocess');
+        if (mergeaccountprocess === '1') {
+            if (!version) {
+                version = localStorage.getItem('version');
+            }
+            hideElement("mergeAccountMessage");
+            renderingType = 'local-storage';
+            var error_summary = document.getElementById('error-summary');
+            if (error_summary) {
+                var errorMessage = error_summary.innerHTML.valueOf();
+                error_summary.innerHTML = errorMessage + 'to merge';
+            }
+        }
+    } else {
+        localStorage.clear()
+    }
+    addVersionToURL(version);
+    var error_message = (new URLSearchParams(window.location.search)).get('error_message');
+    var success_message = (new URLSearchParams(window.location.search)).get('success_message');
+
+    if(error_message){
+        var error_msg = document.getElementById('error-msg');
+        error_msg.className = error_msg.className.replace("hide","");
+        error_msg.innerHTML = error_message;
+    }else if(success_message){
+        var success_msg = document.getElementById("success-msg");
+        success_msg.className = success_msg.className.replace("hide","");
+        success_msg.innerHTML = success_message;
+    }
+    if (version >= 4) {
+        var forgotElement = document.getElementById("fgtPortalFlow");
+        if(forgotElement){
+          forgotElement.className = forgotElement.className.replace("hide","");
+        }
+    } else {
+        var forgotElement = document.getElementById("fgtKeycloakFlow");
+        if(forgotElement){
+          forgotElement.className = forgotElement.className.replace("hide","");
+          forgotElement.href = forgotElement.href + '&version=' + version ;
+        }
+    }
+    if(!version && isForgetPasswordAllow >=4 ){
+        hideElement("fgtKeycloakFlow");
+        var forgotElement = document.getElementById("fgtPortalFlow");
+        if(forgotElement){
+            forgotElement.className = forgotElement.className.replace("hide","");
+        }
+    }
+    if (mergeaccountprocess === '1') {
+        hideElement("kc-registration");
+        hideElement("stateButton");
+        hideElement("fgtKeycloakFlow");
+        hideElement("fgtPortalFlow");
+        // change sign in label with merge label
+        var signIn = document.getElementById("signIn");
+        if (signIn) {
+            signIn.innerText = 'Merge Account';
+            signIn.classList.add('fs-22');
+        }
+        // adding link to go back url
+        var goBackElement = document.getElementById("goBack");
+        if (goBackElement) {
+            goBackElement.className = goBackElement.className.replace("hide", "");
+        }
+        // if rendering type is local-storage get redirect url from localstorage else from query param
+        if (renderingType === 'local-storage') {
+            goBackElement.href = localStorage.getItem('redirectUrl');
+        } else {
+            goBackElement.href = (new URLSearchParams(window.location.search)).get('goBackUrl');
+            localStorage.setItem('mergeaccountprocess', mergeaccountprocess);
+            localStorage.setItem('version', version);
+            localStorage.setItem('redirectUrl', (new URLSearchParams(window.location.search)).get('goBackUrl'));
+        }
+        var mergeAccountMessage = document.getElementById("mergeAccountMessage");
+        if (mergeAccountMessage && renderingType === 'queryParams') {
+            mergeAccountMessage.className = mergeAccountMessage.className.replace("hide", "");
+        }
+    }
+    var autoMerge = getValueFromSession('automerge');
+    if (autoMerge === '1') {
+      var isValuePresent = (new URLSearchParams(window.location.search)).get('automerge');
+      if (isValuePresent) {
+        sessionStorage.removeItem('session_url');
+        initialize();
+      }
+        decoratePage('autoMerge');
+        storeValueForMigration();
+    }
+};
+
+var storeValueForMigration = function () {
+    // storing values in sessionStorage for future references
+    sessionStorage.setItem('automerge', getValueFromSession('automerge'));
+    sessionStorage.setItem('goBackUrl', getValueFromSession('goBackUrl'));
+    sessionStorage.setItem('identifierValue', getValueFromSession('identifierValue'));
+    sessionStorage.setItem('identifierType', getValueFromSession('identifierType'));
+    sessionStorage.setItem('userId', getValueFromSession('userId'));
+    sessionStorage.setItem('tncAccepted', getValueFromSession('tncAccepted'));
+    sessionStorage.setItem('tncVersion', getValueFromSession('tncVersion'));
+};
+var getValueFromSession = function (valueId) {
+    var value = (new URLSearchParams(window.location.search)).get(valueId);
+    if (value) {
+        sessionStorage.setItem(valueId, value);
+        sessionStorage.setItem('renderingType', 'queryParams');
+        return value
+    } else {
+        value = sessionStorage.getItem(valueId);
+        if (value) {
+            sessionStorage.setItem('renderingType', 'sessionStorage');
+        }
+        return value
+    }
+};
+
+
+var getValue = function (valueId) {
+    var value = (new URLSearchParams(window.location.search)).get(valueId);
+    if (value) {
+        localStorage.setItem('renderingType', 'queryParams');
+        return value
+    } else {
+        value = localStorage.getItem(valueId);
+        if (value) {
+            localStorage.setItem('renderingType', 'localStorage');
+        }
+        return value
+    }
+};
+
+
+var decoratePage = function (pageType) {
+    if (pageType === 'autoMerge') {
+        var identifierValue = getValueFromSession('identifierValue');
+        var goBackUrl = getValueFromSession('goBackUrl');
+        var signIn = document.getElementById("signIn");
+        if (signIn) {
+            signIn.innerText = 'Merge Account';
+            signIn.classList.add('fs-22');
+        }
+        var loginButton = document.getElementById("login");
+        if (loginButton) {
+            loginButton.innerText = 'Next';
+        }
+        setElementValue('username', identifierValue);
+
+        var elementsToHide = ['kc-registration', 'stateButton', 'fgtKeycloakFlow', 'fgtPortalFlow',
+            'usernameLabel', 'usernameLabelPlaceholder', 'username'];
+
+        unHideElement('migrateAccountMessage');
+        unHideElement('goBack');
+        var goBackElement = document.getElementById("goBack");
+        if (goBackElement) {
+            goBackElement.href = goBackUrl;
+        }
+        if (sessionStorage.getItem('renderingType') === 'sessionStorage') {
+            unHideElement('selfSingUp');
+            var errorElement = document.getElementById('error-summary');
+            if (errorElement) { 
+                var wrongPasswordError = 'Invalid Email Address/Mobile number or password. Please try again with valid credentials';
+                if (errorElement.innerText.toLowerCase() === wrongPasswordError.toLowerCase()) {
+                    unHideElement('inCorrectPasswordError');
+                    handlePasswordFailure();
+                }
+                elementsToHide.push('error-summary');
+            }
+        }
+        for (var i = 0; i < elementsToHide.length; i++) {
+            hideElement(elementsToHide[i]);
+        }
+    }
+};
+
+var handlePasswordFailure = function () {
+    var passwordFailCount = Number(sessionStorage.getItem('passwordFailCount') || 0);
+    passwordFailCount = passwordFailCount + 1;
+    sessionStorage.setItem('passwordFailCount', passwordFailCount);
+    if (passwordFailCount >= 2) {
+        const url = '/sign-in/sso/auth?status=error' + '&identifierType=' + getValueFromSession('identifierType');
+        let query = '&userId=' + getValueFromSession('userId') + '&identifierValue=' + getValueFromSession('identifierValue');
+        query = query + '&tncAccepted=' + getValueFromSession('tncAccepted') + '&tncVersion=' + getValueFromSession('tncVersion');
+        window.location.href = window.location.protocol + '//' + window.location.host + url + query;
+    }
+};
+
+var unHideElement = function (elementId) {
+    var elementToUnHide = document.getElementById(elementId);
+    if (elementToUnHide) {
+        elementToUnHide.className = elementToUnHide.className.replace("hide", "");
+    }
+};
+var setElementValue = function (elementId, elementValue) {
+    var element = document.getElementById(elementId);
+    if (element) {
+        element.value = elementValue;
+    }
+};
+
+var storeLocation = function(){
+    sessionStorage.setItem('url', window.location.href);
+}
+var addVersionToURL = function (version){
+
+    if (version >= 1){
+
+        var selfSingUp = document.getElementById("selfSingUp");
+
+        if(selfSingUp) {
+            selfSingUp.className = selfSingUp.className.replace(/\bhide\b/g, "");
+        }
+
+        var stateButton = document.getElementById("stateButton");
+
+        if ((version >= 2) && stateButton) {
+            stateButton.className = stateButton.className.replace(/\bhide\b/g, "");
+        }
+    }
+}
+  var makeDivUnclickable = function() {
+    var otpForm = document.getElementById("kc-totp-login-form");
+    var resetPswdForm = document.getElementById("kc-reset-password-form");
+    if(resetPswdForm!==null){
+      logInteractEvent("reset-password-submit");
+      logLoginImpressionEvent("pageexit");
+    }
+    if(otpForm!==null){
+      logInteractEvent("otp-submit");
+      logLoginImpressionEvent("pageexit");
+    }
+    var containerElement = document.getElementById('kc-form');
+    var overlayEle = document.getElementById('kc-form-wrapper');
+    overlayEle.style.display = 'block';
+    containerElement.setAttribute('class', 'unClickable');
+  };
+
+var inputBoxFocusIn = function(currentElement){
+    var autoMerge = getValueFromSession('automerge');
+    if (autoMerge === '1') {
+        return;
+    }
+    if(currentElement.id !== 'totp'){
+      var placeholderElement = document.querySelector("label[id='"+currentElement.id+"LabelPlaceholder']");
+      var labelElement = document.querySelector("label[id='"+currentElement.id+"Label']");
+      placeholderElement.className = placeholderElement.className.replace("hide", "");
+      addClass(labelElement,"hide");
+    }
+};
+var inputBoxFocusOut = function(currentElement){
+  var autoMerge = getValueFromSession('automerge');
+    if (autoMerge === '1') {
+        return;
+    }
+    if(currentElement.id !== 'totp'){
+      var placeholderElement = document.querySelector("label[id='"+currentElement.id+"LabelPlaceholder']");
+      var labelElement = document.querySelector("label[id='"+currentElement.id+"Label']");
+      labelElement.className = labelElement.className.replace("hide", "");
+      addClass(placeholderElement,"hide");
+    }
+  };
+  function hideElement(elementId) {
+    var elementToHide = document.getElementById(elementId);
+    if (elementToHide) {
+        addClass(elementToHide, "hide");
+    }
+  }
+  function addClass(element,classname)
+  {
+    var arr;
+      arr = element.className.split(" ");
+      if (arr.indexOf(classname) == -1) {
+        element.className += " " + classname;
+    }
+  }
+
+  var storeForgotPasswordLocation = function(ev) {
+    ev.preventDefault();
+    //Telemetry.config.batchsize = 2;
+    sessionStorage.setItem('url', window.location.href);
+    //makeDivUnclickable();
+    logInteractEvent("forgot-password");
+    logLoginImpressionEvent("pageexit");
+    setTimeout(function(){
+      window.location.href = ev.target.href;
+    },100);
+    //return true;
+  }
+  var createTelemetryEvent = function(ev) {
+    ev.preventDefault();
+    logInteractEvent("forgot-password");
+    logLoginImpressionEvent("pageexit");
+  }
+  var urlMap = {
+    google: '/google/auth',
+    state: '/sign-in/sso/select-org',
+    self: '/signup'
+  }
+  var navigate = function(type) {
+    var version = getValueFromSession('version');
+    if(version == '1' || version == '2') {
+      if(type == 'google' || type == 'self'){
+        if(type=='google'){
+          logInteractEvent("google-signin");
+        }else if(type=='self'){
+          logInteractEvent("sign-up");
+        }
+        redirect(urlMap[type]);
+      } else if(type == 'state') {
+        logInteractEvent("state-signin");
+        handleSsoEvent()
+      }
+    } else if (version >= '3') {
+      if(type == 'google') {
+        logInteractEvent("google-signin");
+        handleGoogleAuthEvent()
+      } else if(type == 'state' || type == 'self') {
+        if(type == 'state'){
+          logInteractEvent("state-signin");
+        }else if(type == 'self'){
+          logInteractEvent("sign-up");
+        }
+        redirectToPortal(urlMap[type])
+      }
+    }
+  }
+
+  var redirectToLib = () => {
+    window.location.href = window.location.protocol + '//' + window.location.host + '/resource';
+  };
+
+  var viewPassword = function(previewButton){
+    console.log('Show Password');
+
+    var newPassword = document.getElementById("password-new");
+      if (newPassword.type === "password") {
+      newPassword.type = "text";
+      addClass(previewButton,"slash");
+      } else {
+      newPassword.type = "password";
+      previewButton.className = previewButton.className.replace("slash","");
+      }
+  }
+
+var initialize = () => {
+    getValueFromSession('redirect_uri');
+    if (!sessionStorage.getItem('session_url')) {
+        sessionStorage.setItem('session_url', window.location.href);
+    }
+};
+
+initialize();
+
+var forgetPassword = (redirectUrlPath) => {
+    const curUrlObj = window.location;
+    var redirect_uri = getValueFromSession('redirect_uri');
+    var client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+    const sessionUrl = sessionStorage.getItem('session_url');
+    if (sessionUrl) {
+        const sessionUrlObj = new URL(sessionUrl);
+        const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
+        if (redirect_uri) {
+            const redirect_uriLocation = new URL(redirect_uri);
+          if (client_id === 'android' || client_id === 'desktop') {
+                window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
+            }
+            else{
+                window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
+                    redirectUrlPath + updatedQuery;
+            }
+        } else {
+            redirectToLib();
+        }
+    } else {
+        redirectToLib();
+    }
+}
+
+var redirect = (redirectUrlPath) => {
+    console.log('redirect', redirectUrlPath);
+    const curUrlObj = window.location;
+    var redirect_uri = getValueFromSession('redirect_uri');
+    var client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+    const sessionUrl = sessionStorage.getItem('session_url');
+    if (sessionUrl) {
+        const sessionUrlObj = new URL(sessionUrl);
+        const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
+        if (redirect_uri) {
+            const redirect_uriLocation = new URL(redirect_uri);
+            if (client_id === 'android' || client_id === 'desktop') {
+                window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
+            } else {
+                window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
+                    redirectUrlPath + updatedQuery;
+            }
+        } else {
+            redirectToLib();
+        }
+    } else {
+        redirectToLib();
+    }
+};
+var handleSsoEvent = () => {
+    const ssoPath = '/sign-in/sso/select-org';
+    const curUrlObj = window.location;
+    let redirect_uri = getValueFromSession('redirect_uri');
+    let client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+    const sessionUrl = sessionStorage.getItem('session_url');
+    if (sessionUrl) {
+        const sessionUrlObj = new URL(sessionUrl);
+        if (redirect_uri) {
+            const redirect_uriLocation = new URL(redirect_uri);
+            if (client_id === 'android' || client_id === 'desktop') {
+                const ssoUrl = sessionUrlObj.protocol + '//' + sessionUrlObj.host + ssoPath;
+                window.location.href = redirect_uri + '?ssoUrl=' + ssoUrl;
+            } else {
+                window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host + ssoPath;
+            }
+        } else {
+            redirectToLib();
+        }
+    } else {
+        redirectToLib();
+    }
+};
+var handleGoogleAuthEvent = () => {
+    const googleAuthUrl = '/google/auth';
+    const curUrlObj = window.location;
+    let redirect_uri = getValueFromSession('redirect_uri');
+    let client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+    const updatedQuery = curUrlObj.search + '&error_callback=' + curUrlObj.href.split('?')[0];
+    const sessionUrl = sessionStorage.getItem('session_url');
+    if (sessionUrl) {
+        const sessionUrlObj = new URL(sessionUrl);
+        const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
+        if (redirect_uri) {
+            const redirect_uriLocation = new URL(redirect_uri);
+            if (client_id === 'android' || client_id === 'desktop') {
+                let host = sessionUrlObj.host;
+                if (host.indexOf("merge.") !== -1) {
+                    host = host.slice(host.indexOf("merge.") + 6, host.length);
+                }
+                const googleRedirectUrl = sessionUrlObj.protocol + '//' + host + googleAuthUrl;
+                window.location.href = redirect_uri + '?googleRedirectUrl=' + googleRedirectUrl + updatedQuery;
+            } else {
+                window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host + googleAuthUrl + updatedQuery;
+            }
+        } else {
+            redirectToLib();
+        }
+    } else {
+        redirectToLib();
+    }
+};
+var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and self signUp
+    const curUrlObj = window.location;
+    var redirect_uri = getValueFromSession('redirect_uri');
+    var client_id = (new URLSearchParams(curUrlObj.search)).get('client_id');
+    const sessionUrl = sessionStorage.getItem('session_url');
+    if (sessionUrl) {
+        const sessionUrlObj = new URL(sessionUrl);
+        const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
+        if (redirect_uri) {
+            const redirect_uriLocation = new URL(redirect_uri);
+            if (client_id === 'android' || client_id === 'desktop') {
+                window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
+            } else {
+                window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
+                    redirectUrlPath + updatedQuery;
+            }
+        } else {
+            redirectToLib();
+        }
+    } else {
+        redirectToLib();
+    }
+};
+
+var validatePassword = () => {
+	setTimeout(() => {
+		var textInput = document.getElementById("password-new").value;
+		var text2Input = document.getElementById("password-confirm").value;
+		const specRegex = new RegExp('^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[~.,)(}{\\[!"#$%&\'()*+,-./:;<=>?@[^_`{|}~\\]])(?=\\S+$).{8,}');
+		var error_msg = document.getElementById('passwd-error-msg');
+		var match_error_msg = document.getElementById('passwd-match-error-msg');
+    if (specRegex.test(textInput)) {
+			error_msg.className = error_msg.className.replace("passwderr","passwdchk");
+			if (textInput === text2Input) {
+				match_error_msg.className = match_error_msg.className.replace("show","hide");
+				document.getElementById("login").disabled = false;
+			}
+		} else {
+			error_msg.className = error_msg.className.replace("passwdchk","passwderr");
+		}
+		if (textInput !== text2Input) {
+			document.getElementById("login").disabled = true;
+		}
+	});
+}
+
+var matchPassword = () => {
+	setTimeout(() => {
+		var textInput = document.getElementById("password-new").value;
+		var text2Input = document.getElementById("password-confirm").value;
+		const specRegex = new RegExp('^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[~.,)(}{\\[!"#$%&\'()*+,-./:;<=>?@[^_`{|}~\\]])(?=\\S+$).{8,}');
+		var match_error_msg = document.getElementById('passwd-match-error-msg');
+		if (textInput === text2Input) {
+            if (specRegex.test(text2Input)) {
+				match_error_msg.className = match_error_msg.className.replace("show","hide");
+				document.getElementById("login").disabled = false;
+			}
+		} else {
+			match_error_msg.className = match_error_msg.className.replace("hide","show");
+			document.getElementById("login").disabled = true;
+		}
+	});
+}
+
+//})();
diff --git a/ansible/artifacts/sunbird/login/theme.properties b/ansible/artifacts/sunbird/login/theme.properties
index 83d89458c..153e0d101 100644
--- a/ansible/artifacts/sunbird/login/theme.properties
+++ b/ansible/artifacts/sunbird/login/theme.properties
@@ -13,9 +13,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+# scripts=js/login.js?v=1.15.b
 
 parent=base
 styles=css/semantic.min.css?v=1.15.b css/login.css?v=1.15.b
-scripts=js/login.js?v=1.15.b
+scripts=js/jquery-3.3.1.min.js?v=1.15.b js/telemetry_service.js?v=1.15.b
 kcFeedbackAreaClass=ui info message

From 8e6191a4088101d6d8ad34a74841a98f08b72792 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Mon, 11 Jan 2021 16:21:24 +0000
Subject: [PATCH 117/184] Nodebb and cassandra changes (#2147)

* changed the cassandra backup naming format

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>

* changing mongo host:port combo to host
---
 ansible/inventory/env/group_vars/all.yml      | 2 +-
 ansible/roles/cassandra-backup/tasks/main.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index 1faf34d77..45ce79c98 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -648,4 +648,4 @@ group_activity_agg_cache_ttl: 3600
 group_activity_agg_cache_enable: false
 
 # nodebb variables
-mongo_nodebb_host: "{{ groups['mongo'] | join(':27017,')}}:27017"
+mongo_nodebb_host: "{{ groups['mongo'] | join(',')}}"
diff --git a/ansible/roles/cassandra-backup/tasks/main.yml b/ansible/roles/cassandra-backup/tasks/main.yml
index c06685ca9..86e53195a 100755
--- a/ansible/roles/cassandra-backup/tasks/main.yml
+++ b/ansible/roles/cassandra-backup/tasks/main.yml
@@ -9,12 +9,12 @@
 - name: copy the backup script
   become: yes
   template:
-    src: ../../../../deploy/cassandra_backup.py 
+    src: ../../../../deploy/cassandra_backup.py
     dest: /data/cassandra/backup/cassandra_backup.py
     mode: 0755
 
 - set_fact:
-    cassandra_backup_gzip_file_name: "cassandra-backup-{{ lookup('pipe', 'date +%Y%m%d') }}-{{ ansible_hostname }}-new"
+    cassandra_backup_gzip_file_name: "cassandra-backup-{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}-{{ ansible_hostname }}-new"
 
 - name: run the backup script
   become: yes

From 9a3f25d78d58f79ab045a214b3b7602e5b7f7134 Mon Sep 17 00:00:00 2001
From: VenkatKadiveti <60449077+VenkatKadiveti@users.noreply.github.com>
Date: Tue, 12 Jan 2021 12:21:47 +0530
Subject: [PATCH 118/184] Issue #SB-22183 fix: adding discription to generate
 master token (#2149)

---
 .../stack-sunbird/templates/sunbird_discussions-mw-service.env  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
index c9f0af0c9..a1654a878 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_discussions-mw-service.env
@@ -5,5 +5,5 @@ nodebb_api_slug={{discussionsmw_nodebb_api_slug | default('/discussions/api') }}
 # 1. Login to Nodebb (https://<domain-name>/discussions/login) as a Admin.
 # 2. go to admin panel.
 # 3. click on Plugins => Write API
-# 4. enter UID as 1 and click create token (Auth token).
+# 4. Under MASTER TOKENS section, click on create token button, It will generate a token.
 authorization_token={{ discussionsmw_nodebb_authorization_token }}

From d0019917043750c93c0790aae72ad5bf3a1ba063 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <yravinderkumar33@gmail.com>
Date: Tue, 12 Jan 2021 13:31:20 +0530
Subject: [PATCH 119/184] Issue #SB-22405 fix: tenantSlug fix for orgSearch API
 call.

---
 .../login/resources/js/telemetry_service.js      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
index b578b1277..30d62adb7 100644
--- a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
+++ b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -2476,6 +2476,7 @@ if (typeof module != 'undefined') {
 }
 
 let pdataId = "";
+let tenantSlug;
 if (window.location.origin.indexOf("diksha.gov.in") >= 0) {
   pdataId = "prod.diksha.portal";
 } else if (window.location.origin.indexOf("staging.ntp.net.in") >= 0) {
@@ -2484,6 +2485,7 @@ if (window.location.origin.indexOf("diksha.gov.in") >= 0) {
   pdataId = "staging.diksha.portal";
 } else if (window.location.origin.indexOf("dev.sunbirded.org") >= 0) {
   pdataId = "dev.sunbird.portal";
+  tenantSlug = "sunbird";
 } else {
   pdataId = "preprod.diksha.portal";
 }
@@ -2516,7 +2518,7 @@ if(client_id.toLowerCase() === 'android'){
     hostURL = url;
   }
   function OnLoad() {
-    tenantId = sessionStorage.getItem("tenantSlug") || 'sunbird';
+    tenantId = sessionStorage.getItem("tenantSlug") || tenantSlug;
     getOrgInfo(tenantId).done(function () {
       initTelemetryService();
       logLoginImpressionEvent("init");
@@ -2554,7 +2556,7 @@ if(client_id.toLowerCase() === 'android'){
       host: hostURL,
       uid: 'anonymous',
       sid: window.uuidv1(),
-      channel: orgInfo.hashTagId,
+      channel: orgInfo && orgInfo.hashTagId,
       env: 'public'
     }
   }
@@ -2569,13 +2571,13 @@ if(client_id.toLowerCase() === 'android'){
     var options = {
       context: {
         env: 'public',
-        channel: orgInfo.hashTagId,
+        channel: orgInfo && orgInfo.hashTagId,
         uid: 'anonymous',
         cdata: [],
-        rollup: getRollupData([orgInfo.hashTagId])
+        rollup: orgInfo && orgInfo.hashTagId && getRollupData([orgInfo.hashTagId])
       },
       object: {},
-      tags: [orgInfo.hashTagId]
+      tags: orgInfo && orgInfo.hashTagId && [orgInfo.hashTagId]
     };
     var edata = {
       type: "view",
@@ -2594,10 +2596,10 @@ if(client_id.toLowerCase() === 'android'){
         channel: orgInfo.hashTagId,
         uid: 'anonymous',
         cdata: [],
-        rollup: getRollupData([orgInfo.hashTagId])
+        rollup: orgInfo && orgInfo.hashTagId && getRollupData([orgInfo.hashTagId])
       },
       object: {},
-      tags: [orgInfo.hashTagId]
+      tags: orgInfo && orgInfo.hashTagId && [orgInfo.hashTagId]
     };
     var edata = {
       id: interactid,

From 91670ac2a6719e624c1744963d4fda12c348a1ef Mon Sep 17 00:00:00 2001
From: Kumar Gauraw <er.krgauraw@gmail.com>
Date: Tue, 12 Jan 2021 14:19:00 +0530
Subject: [PATCH 120/184] Issue #DP-1528 fix: updated composite search config

---
 .../stack-sunbird/templates/content-service_application.conf    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index c48ecb69b..fa65add72 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -471,7 +471,7 @@ languageCode {
 }
 composite {
   search {
-    url : "{{ proto }}://{{ proxy_server_name }}/action/composite/v3/search"
+    url : "{{ sunbird_search_service_api_base_url }}/v3/search"
   }
 }
 cloud_storage_type: "azure"

From 35a334ad13fe49183c7017bf594bd1e85db07c2f Mon Sep 17 00:00:00 2001
From: G33tha <geethap240@gmail.com>
Date: Tue, 12 Jan 2021 14:36:50 +0530
Subject: [PATCH 121/184] added hpa for all core serices (#2145)

* added hpa for all core serices

Co-authored-by: G33tha <geethap240@gmial.com>
---
 .../core/adminutils/templates/hpa.yaml        | 28 +++++++++++++++++++
 .../helm_charts/core/adminutils/values.j2     |  8 ++++++
 .../core/analytics/templates/hpa.yaml         | 27 ++++++++++++++++++
 .../helm_charts/core/analytics/values.j2      |  7 +++++
 .../core/apimanager/templates/hpa.yaml        | 27 ++++++++++++++++++
 .../helm_charts/core/apimanager/values.j2     |  8 ++++++
 .../core/apimanagerecho/templates/hpa.yaml    | 27 ++++++++++++++++++
 .../helm_charts/core/apimanagerecho/values.j2 |  7 +++++
 .../core/assessment/templates/hpa.yaml        | 27 ++++++++++++++++++
 .../helm_charts/core/assessment/values.j2     |  7 +++++
 .../helm_charts/core/cert/templates/hpa.yaml  | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/cert/values.j2    |  7 +++++
 .../core/certregistry/templates/hpa.yaml      | 27 ++++++++++++++++++
 .../helm_charts/core/certregistry/values.j2   |  7 +++++
 .../core/content/templates/hpa.yaml           | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/content/values.j2 |  7 +++++
 .../helm_charts/core/enc/templates/hpa.yaml   | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/enc/values.j2     |  7 +++++
 .../core/groups/templates/hpa.yaml            | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/groups/values.j2  |  7 +++++
 .../core/knowledgemw/templates/hpa.yaml       | 27 ++++++++++++++++++
 .../helm_charts/core/knowledgemw/values.j2    |  7 +++++
 .../core/learner/templates/hpa.yaml           | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/learner/values.j2 |  7 +++++
 .../helm_charts/core/lms/templates/hpa.yaml   | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/lms/values.j2     |  7 +++++
 .../nginx-private-ingress/templates/hpa.yaml  | 27 ++++++++++++++++++
 .../core/nginx-private-ingress/values.j2      |  8 ++++++
 .../core/nodebb/templates/configmap.yaml      |  2 +-
 .../core/nodebb/templates/deployment.yaml     | 20 +++++++++++++
 .../core/nodebb/templates/hpa.yaml            | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/nodebb/values.j2  |  7 +++++
 .../core/notification/templates/hpa.yaml      | 27 ++++++++++++++++++
 .../helm_charts/core/notification/values.j2   |  6 ++++
 .../core/player/templates/hpa.yaml            | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/player/values.j2  |  7 +++++
 .../helm_charts/core/print/templates/hpa.yaml | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/print/values.j2   |  7 +++++
 .../core/report/templates/hpa.yaml            | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/report/values.j2  |  7 +++++
 .../core/search/templates/hpa.yaml            | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/search/values.j2  |  7 +++++
 .../core/taxonomy/templates/hpa.yaml          | 27 ++++++++++++++++++
 .../helm_charts/core/taxonomy/values.j2       |  9 +++++-
 .../core/telemetry/templates/hpa.yaml         | 27 ++++++++++++++++++
 .../helm_charts/core/telemetry/values.j2      |  7 +++++
 .../core/userorg/templates/hpa.yaml           | 27 ++++++++++++++++++
 kubernetes/helm_charts/core/userorg/values.j2 |  7 +++++
 48 files changed, 807 insertions(+), 2 deletions(-)
 create mode 100644 kubernetes/helm_charts/core/adminutils/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/analytics/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/apimanager/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/apimanagerecho/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/assessment/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/cert/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/certregistry/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/content/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/enc/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/groups/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/knowledgemw/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/learner/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/lms/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/nginx-private-ingress/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/nodebb/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/notification/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/player/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/print/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/report/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/search/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/telemetry/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/core/userorg/templates/hpa.yaml

diff --git a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml
new file mode 100644
index 000000000..39a014065
--- /dev/null
+++ b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml
@@ -0,0 +1,28 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
+
diff --git a/kubernetes/helm_charts/core/adminutils/values.j2 b/kubernetes/helm_charts/core/adminutils/values.j2
index 7c9cc6d6d..35b573b11 100644
--- a/kubernetes/helm_charts/core/adminutils/values.j2
+++ b/kubernetes/helm_charts/core/adminutils/values.j2
@@ -1,3 +1,4 @@
+
 ### Default variable file for cert-service ###
 
 namespace: {{ namespace }}
@@ -59,3 +60,10 @@ adminutilenv:
   ACCESS_TOKEN_VALIDITY: '"{{ adminutil_access_token_validity }}"'
   REFRESH_TOKEN_OFFLINE_VALIDITY: '"{{ adminutil_refresh_token_offline_validity }}"'
   REFRESH_TOKEN_LOG_OLDER_THAN: '"{{  adminutil_refresh_token_log_older_than }}"'
+
+autoscaling:
+  enabled: {{ adminutils_autoscaling_enabled | default('false') }}
+  minReplicas: {{ adminutils_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ adminutils_autoscaling_maxReplicas|default(4) }}
+  targetCPUUtilizationPercentage: {{ adminutils_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ adminutils_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/analytics/templates/hpa.yaml b/kubernetes/helm_charts/core/analytics/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/analytics/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/analytics/values.j2 b/kubernetes/helm_charts/core/analytics/values.j2
index c1df8545b..04e704ddb 100644
--- a/kubernetes/helm_charts/core/analytics/values.j2
+++ b/kubernetes/helm_charts/core/analytics/values.j2
@@ -36,3 +36,10 @@ serviceMonitor:
   labels: # labels with which the prometheus choose the serviceMonitor
     app: prometheus-operator
     release: prometheus-operator
+
+autoscaling:
+  enabled: {{ analytics_autoscaling_enabled | default('false') }}
+  minReplicas: {{ analytics_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ analytics_autoscaling_maxReplicas|default(4) }}
+  targetCPUUtilizationPercentage: {{ analytics_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ analytics_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/apimanager/templates/hpa.yaml b/kubernetes/helm_charts/core/apimanager/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/apimanager/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/apimanager/values.j2 b/kubernetes/helm_charts/core/apimanager/values.j2
index 4270bc727..35458f87f 100755
--- a/kubernetes/helm_charts/core/apimanager/values.j2
+++ b/kubernetes/helm_charts/core/apimanager/values.j2
@@ -26,3 +26,11 @@ strategy:
   maxunavailable: {{ apimanager_maxunavailable|default('25%') }}
 
 {{ apimanager_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ apimanager_autoscaling_enabled | default('false') }}
+  minReplicas: {{ apimanager_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ apimanager_autoscaling_maxReplicas|default(4) }}
+  targetCPUUtilizationPercentage: {{ apimanager_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ apimanager_autoscaling_targetMemoryUtilizationPercentage|default('') }}
+
diff --git a/kubernetes/helm_charts/core/apimanagerecho/templates/hpa.yaml b/kubernetes/helm_charts/core/apimanagerecho/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/apimanagerecho/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/apimanagerecho/values.j2 b/kubernetes/helm_charts/core/apimanagerecho/values.j2
index ff53d1679..1af58bb8d 100755
--- a/kubernetes/helm_charts/core/apimanagerecho/values.j2
+++ b/kubernetes/helm_charts/core/apimanagerecho/values.j2
@@ -21,3 +21,10 @@ strategy:
   type: RollingUpdate
 
 {{ api_managerecho_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ apimanagerecho_autoscaling_enabled | default('false') }}
+  minReplicas: {{ apimanagerecho_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ apimanagerecho_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ apimanagerecho_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ apimanagerecho_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/assessment/templates/hpa.yaml b/kubernetes/helm_charts/core/assessment/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/assessment/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/assessment/values.j2 b/kubernetes/helm_charts/core/assessment/values.j2
index d4dc22f04..b38668ff8 100644
--- a/kubernetes/helm_charts/core/assessment/values.j2
+++ b/kubernetes/helm_charts/core/assessment/values.j2
@@ -28,3 +28,10 @@ strategy:
   maxunavailable: {{ assessment_maxunavailable|default('25%') }}
 
 {{ assessment_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ assessment_autoscaling_enabled | default('false') }}
+  minReplicas: {{ assessment_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ assessment_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ assessment_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ assessment_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/cert/templates/hpa.yaml b/kubernetes/helm_charts/core/cert/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/cert/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/cert/values.j2 b/kubernetes/helm_charts/core/cert/values.j2
index b6e4488b8..6de0dc6e8 100644
--- a/kubernetes/helm_charts/core/cert/values.j2
+++ b/kubernetes/helm_charts/core/cert/values.j2
@@ -26,3 +26,10 @@ strategy:
   maxunavailable: {{ cert_maxunavailable|default('25%') }}
 
 {{ cert_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ cert_autoscaling_enabled | default('false') }}
+  minReplicas: {{ cert_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ cert_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ cert_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ cert_autoscaling_targetMemoryUtilizationPercentage|default('') }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml b/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/certregistry/values.j2 b/kubernetes/helm_charts/core/certregistry/values.j2
index 9ba6889f7..0a1dcd473 100644
--- a/kubernetes/helm_charts/core/certregistry/values.j2
+++ b/kubernetes/helm_charts/core/certregistry/values.j2
@@ -26,3 +26,10 @@ strategy:
   maxunavailable: {{ certregistry_maxunavailable|default('25%') }}
 
 {{ cert_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ certregistry_autoscaling_enabled | default('false') }}
+  minReplicas: {{ certregistry_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ certregistry_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ certregistry_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ certregistry_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/content/templates/hpa.yaml b/kubernetes/helm_charts/core/content/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/content/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/content/values.j2 b/kubernetes/helm_charts/core/content/values.j2
index b2d93411b..30fffe524 100644
--- a/kubernetes/helm_charts/core/content/values.j2
+++ b/kubernetes/helm_charts/core/content/values.j2
@@ -26,3 +26,10 @@ strategy:
   maxunavailable: {{ content_maxunavailable|default('25%') }}
 
 {{ content_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ content_autoscaling_enabled | default('false') }}
+  minReplicas: {{ content_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ content_autoscaling_maxReplicas|default(4) }}
+  targetCPUUtilizationPercentage: {{ content_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ content_autoscaling_targetMemoryUtilizationPercentage|default('') }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/enc/templates/hpa.yaml b/kubernetes/helm_charts/core/enc/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/enc/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/enc/values.j2 b/kubernetes/helm_charts/core/enc/values.j2
index 3f375b060..4544cb2ad 100644
--- a/kubernetes/helm_charts/core/enc/values.j2
+++ b/kubernetes/helm_charts/core/enc/values.j2
@@ -23,3 +23,10 @@ strategy:
   maxunavailable: {{ enc_maxunavailable|default('25%') }}
 
 {{ enc_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ enc_autoscaling_enabled | default('false') }}
+  minReplicas: {{ enc_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ enc_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ enc_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ enc_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/groups/templates/hpa.yaml b/kubernetes/helm_charts/core/groups/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/groups/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/groups/values.j2 b/kubernetes/helm_charts/core/groups/values.j2
index 3a717743d..7a353b19c 100644
--- a/kubernetes/helm_charts/core/groups/values.j2
+++ b/kubernetes/helm_charts/core/groups/values.j2
@@ -29,3 +29,10 @@ strategy:
 {{ groups_liveness_readiness | to_nice_yaml }}
 
 groups_access_basepath: {{ groups_access_basepath | default('/keys/') }}
+
+autoscaling:
+  enabled: {{ groups_autoscaling_enabled | default('false') }}
+  minReplicas: {{ groups_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ groups_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ groups_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ groups_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/knowledgemw/templates/hpa.yaml b/kubernetes/helm_charts/core/knowledgemw/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/knowledgemw/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/knowledgemw/values.j2 b/kubernetes/helm_charts/core/knowledgemw/values.j2
index 3d33b267f..9961e343b 100644
--- a/kubernetes/helm_charts/core/knowledgemw/values.j2
+++ b/kubernetes/helm_charts/core/knowledgemw/values.j2
@@ -25,3 +25,10 @@ strategy:
 {{ knowledgemw_liveness_readiness | to_nice_yaml }}
 
 knowledgemw_access_basepath: {{ knowledgemw_access_basepath | default('/home/sunbird/mw/content/keys/') }}
+
+autoscaling:
+  enabled: {{ knowledgemw_autoscaling_enabled | default('false') }}
+  minReplicas: {{ knowledgemw_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ knowledgemw_autoscaling_maxReplicas|default(4) }}
+  targetCPUUtilizationPercentage: {{ knowledgemw_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ knowledgemw_autoscaling_targetMemoryUtilizationPercentage|default('') }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/learner/templates/hpa.yaml b/kubernetes/helm_charts/core/learner/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/learner/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/learner/values.j2 b/kubernetes/helm_charts/core/learner/values.j2
index 8b897f2a1..273161c56 100644
--- a/kubernetes/helm_charts/core/learner/values.j2
+++ b/kubernetes/helm_charts/core/learner/values.j2
@@ -29,3 +29,10 @@ strategy:
 {{ learner_liveness_readiness | to_nice_yaml }}
 
 learner_access_basepath: {{ learner_access_basepath | default('/keys/') }}
+
+autoscaling:
+  enabled: {{ learner_autoscaling_enabled | default('false') }}
+  minReplicas: {{ learner_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ learner_autoscaling_maxReplicas|default(4) }}
+  targetCPUUtilizationPercentage: {{ learner_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ learner_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/lms/templates/hpa.yaml b/kubernetes/helm_charts/core/lms/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/lms/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/lms/values.j2 b/kubernetes/helm_charts/core/lms/values.j2
index dfbfd9a43..02995b63a 100644
--- a/kubernetes/helm_charts/core/lms/values.j2
+++ b/kubernetes/helm_charts/core/lms/values.j2
@@ -29,3 +29,10 @@ strategy:
 {{ lms_liveness_readiness | to_nice_yaml }}
 
 lms_access_basepath: {{ lms_access_basepath | default('/keys/') }}
+
+autoscaling:
+  enabled: {{ lms_autoscaling_enabled | default('false') }}
+  minReplicas: {{ lms_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ lms_autoscaling_maxReplicas|default(4) }}
+  targetCPUUtilizationPercentage: {{ lms_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ lms_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/nginx-private-ingress/templates/hpa.yaml b/kubernetes/helm_charts/core/nginx-private-ingress/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/nginx-private-ingress/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/nginx-private-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-private-ingress/values.j2
index 64f3b5ad2..18280bf74 100644
--- a/kubernetes/helm_charts/core/nginx-private-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-private-ingress/values.j2
@@ -29,3 +29,11 @@ resources:
   limits:
     cpu: {{nginx_private_ingress_cpu_limit | default('500m')}}
     memory: {{nginx_private_ingress_mem_limit | default('500Mi')}}
+
+autoscaling:
+  enabled: {{ nginx_private_ingress_autoscaling_enabled | default('false') }}
+  minReplicas: {{ nginx_private_ingress_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ nginx_private_ingress_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ nginx_private_ingress_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ nginx_private_ingress_autoscaling_targetMemoryUtilizationPercentage|default('') }}
+
diff --git a/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml b/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
index 94560822a..12aed75c1 100644
--- a/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
+++ b/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
@@ -16,4 +16,4 @@ data:
              "port": "27017",
              "database": "nodebb"
          }
-     }
+     }
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
index 302b1ca40..46b2eb8a4 100644
--- a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
@@ -49,6 +49,26 @@ spec:
         readinessProbe:
 {{ toYaml .Values.readinessProbe | indent 10 }}
         {{- end }}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nodebb-config-json
+data:
+  config.json: |-
+     {
+         "url": "{{ .Values.nodebb_url }}",
+         "secret": "100101",
+         "database": "mongo",
+         "port": "4567",
+         "mongo": {
+             "uri": "mongodb://{{ .Values.mongo_nodebb_host }}",
+             "username": "",
+             "password": "",
+         }
+     }
+
 ---
 apiVersion: v1
 kind: Service
diff --git a/kubernetes/helm_charts/core/nodebb/templates/hpa.yaml b/kubernetes/helm_charts/core/nodebb/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/nodebb/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/nodebb/values.j2 b/kubernetes/helm_charts/core/nodebb/values.j2
index 41e826a9b..5df62febb 100644
--- a/kubernetes/helm_charts/core/nodebb/values.j2
+++ b/kubernetes/helm_charts/core/nodebb/values.j2
@@ -25,3 +25,10 @@ strategy:
 
 nodebb_url: {{ sunbird_nodebb_url | default(proto+'://'+domain_name+'/discussions') }}
 mongo_nodebb_host: {{ mongo_nodebb_host }}
+
+autoscaling:
+  enabled: {{ nodebb_autoscaling_enabled | default('false') }}
+  minReplicas: {{ nodebb_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ nodebb_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ nodebb_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ nodebb_autoscaling_targetMemoryUtilizationPercentage|default('') }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/notification/templates/hpa.yaml b/kubernetes/helm_charts/core/notification/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/notification/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/notification/values.j2 b/kubernetes/helm_charts/core/notification/values.j2
index a37b1c8d7..dac22bc8e 100644
--- a/kubernetes/helm_charts/core/notification/values.j2
+++ b/kubernetes/helm_charts/core/notification/values.j2
@@ -63,3 +63,9 @@ notification:
       port: 9000
     initialDelaySeconds: 60
     periodSeconds: 10
+autoscaling:
+  enabled: {{ notification_autoscaling_enabled | default('false') }}
+  minReplicas: {{ notification_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ notification_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ notification_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ notification_autoscaling_targetMemoryUtilizationPercentage|default('') }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/player/templates/hpa.yaml b/kubernetes/helm_charts/core/player/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/player/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/player/values.j2 b/kubernetes/helm_charts/core/player/values.j2
index c21f6302b..b1f3f102d 100644
--- a/kubernetes/helm_charts/core/player/values.j2
+++ b/kubernetes/helm_charts/core/player/values.j2
@@ -27,3 +27,10 @@ sunbird_portal_player_cdn_enabled: {{sunbird_portal_player_cdn_enabled|lower}}
 {{ player_liveness_readiness | to_nice_yaml }}
 
 player_access_basepath: {{ player_access_basepath | default('/home/sunbird/app_dist/keys/') }}
+
+autoscaling:
+  enabled: {{ player_autoscaling_enabled | default('false') }}
+  minReplicas: {{ player_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ player_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ player_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ player_autoscaling_targetMemoryUtilizationPercentage|default('') }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/print/templates/hpa.yaml b/kubernetes/helm_charts/core/print/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/print/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/print/values.j2 b/kubernetes/helm_charts/core/print/values.j2
index b8f9e06f3..a3f2b2518 100644
--- a/kubernetes/helm_charts/core/print/values.j2
+++ b/kubernetes/helm_charts/core/print/values.j2
@@ -24,3 +24,10 @@ strategy:
   maxunavailable: {{ print_maxunavailable|default('25%') }}
 
 {{ print_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ print_autoscaling_enabled | default('false') }}
+  minReplicas: {{ print_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ print_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ print_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ print_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/report/templates/hpa.yaml b/kubernetes/helm_charts/core/report/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/report/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/report/values.j2 b/kubernetes/helm_charts/core/report/values.j2
index d4c73485c..af509c930 100644
--- a/kubernetes/helm_charts/core/report/values.j2
+++ b/kubernetes/helm_charts/core/report/values.j2
@@ -24,3 +24,10 @@ strategy:
   maxunavailable: {{ report_maxunavailable|default('25%') }}
 
 {{ report_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ report_autoscaling_enabled | default('false') }}
+  minReplicas: {{ report_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ report_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ report_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ report_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/search/templates/hpa.yaml b/kubernetes/helm_charts/core/search/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/search/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/search/values.j2 b/kubernetes/helm_charts/core/search/values.j2
index e1236cdfd..02c6fc9f4 100644
--- a/kubernetes/helm_charts/core/search/values.j2
+++ b/kubernetes/helm_charts/core/search/values.j2
@@ -26,3 +26,10 @@ strategy:
   maxunavailable: {{ search_maxunavailable|default('25%') }}
 
 {{ search_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ search_autoscaling_enabled | default('false') }}
+  minReplicas: {{ search_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ search_autoscaling_maxReplicas|default(4) }}
+  targetCPUUtilizationPercentage: {{ search_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ search_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml b/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/taxonomy/values.j2 b/kubernetes/helm_charts/core/taxonomy/values.j2
index 6079b4d2f..b2c0a7877 100644
--- a/kubernetes/helm_charts/core/taxonomy/values.j2
+++ b/kubernetes/helm_charts/core/taxonomy/values.j2
@@ -1,4 +1,4 @@
-### Default variable file for search-service ###
+### Default variable file for taxonomy-service ###
 
 namespace: {{ namespace }}
 imagepullsecrets: {{ imagepullsecrets }}
@@ -26,3 +26,10 @@ strategy:
   maxunavailable: {{ taxonomy_maxunavailable|default('25%') }}
 
 {{ taxonomy_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ taxonomy_autoscaling_enabled | default('false') }}
+  minReplicas: {{ taxonomy_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ taxonomy_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ taxonomy_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ taxonomy_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml b/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/telemetry/values.j2 b/kubernetes/helm_charts/core/telemetry/values.j2
index e8dd079b5..55a812e9c 100644
--- a/kubernetes/helm_charts/core/telemetry/values.j2
+++ b/kubernetes/helm_charts/core/telemetry/values.j2
@@ -24,3 +24,10 @@ strategy:
   maxunavailable: {{ telemetry_maxunavailable|default }}
 
 {{ telemetry_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ telemetry_autoscaling_enabled | default('false') }}
+  minReplicas: {{ telemetry_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ telemetry_autoscaling_maxReplicas|default(4) }}
+  targetCPUUtilizationPercentage: {{ telemetry_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ telemetry_autoscaling_targetMemoryUtilizationPercentage|default('') }}
diff --git a/kubernetes/helm_charts/core/userorg/templates/hpa.yaml b/kubernetes/helm_charts/core/userorg/templates/hpa.yaml
new file mode 100644
index 000000000..1ba4f89a8
--- /dev/null
+++ b/kubernetes/helm_charts/core/userorg/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/userorg/values.j2 b/kubernetes/helm_charts/core/userorg/values.j2
index 6508b4d13..f90ef0731 100644
--- a/kubernetes/helm_charts/core/userorg/values.j2
+++ b/kubernetes/helm_charts/core/userorg/values.j2
@@ -23,3 +23,10 @@ strategy:
   maxunavailable: {{ userorg_maxunavailable|default('25%') }}
 
 {{ userorg_liveness_readiness | to_nice_yaml }}
+
+autoscaling:
+  enabled: {{ userorg_autoscaling_enabled | default('false') }}
+  minReplicas: {{ userorg_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ userorg_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ userorg_autoscaling_targetCPUUtilizationPercentage|default(80) }}
+  targetMemoryUtilizationPercentage: {{ userorg_autoscaling_targetMemoryUtilizationPercentage|default('') }}
\ No newline at end of file

From 2dc6464a36d023e005244b503574e1552119d723 Mon Sep 17 00:00:00 2001
From: Kumar Gauraw <er.krgauraw@gmail.com>
Date: Tue, 12 Jan 2021 14:44:13 +0530
Subject: [PATCH 122/184] Issue #DP-1528 fix: added search config for
 assessment

---
 .../templates/assessment-service_application.conf           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
index 81cccc4f9..063277b1f 100644
--- a/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/assessment-service_application.conf
@@ -379,3 +379,9 @@ kafka {
 objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_store"
 question.keyspace="{{ lp_cassandra_keyspace_prefix }}_question_store"
 questionset.keyspace="{{ lp_cassandra_keyspace_prefix }}_hierarchy_store"
+
+composite {
+  search {
+    url : "{{ sunbird_search_service_api_base_url }}/v3/search"
+  }
+}

From 3ff4a3bdf04ef71568f1457efb93a1b3991c0810 Mon Sep 17 00:00:00 2001
From: Rajesh Kumaravel <rajesh.kumaravel@tarento.com>
Date: Tue, 12 Jan 2021 18:36:02 +0530
Subject: [PATCH 123/184] Issue #SB-22354 fix: Added env variable for API
 whitelist flag (#2154)

* Issue #SB-20650 fix: Added anonymous user TTL value

* Issue #SB-20650 fix: Updated anonymous user TTL to 30 minutes

* Issue #SB-22354 fix: Added env variable for API whitelist flag
---
 ansible/roles/stack-sunbird/templates/sunbird_player.env | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index 1545ce7b1..5270de2f1 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -144,3 +144,6 @@ portal_redis_connection_string={{portal_redis_connection_string|default('redis:/
 
 # anonymous session ttl in milliseconnds
 sunbird_anonymous_session_ttl={{sunbird_anonymous_session_ttl|default(1800000)}}
+
+# api whitelisting for sunbird portal
+sunbird_enable_api_whitelist={{sunbird_enable_api_whitelist|default('true')}}

From dd9961f144cecd830cc5be6c0274d73e4f2d1dd2 Mon Sep 17 00:00:00 2001
From: kaliraja <34502260+Kaali09@users.noreply.github.com>
Date: Wed, 13 Jan 2021 12:09:25 +0530
Subject: [PATCH 124/184] added the new dashboards (#2155)

* Issue #TG-714: added the new dashboards

* Issue #TG-714: corrected the syntax error
---
 .../data-pipeline-metrics-flink.json          | 5879 ++++++++++
 .../dashboards/dashboards/lag-dashboard.json  | 9757 +++++++++++++++++
 ...yaml => dashboards-dp-json-configmap.yaml} |    0
 .../monitoring/dashboards/values.yaml         |   21 +-
 4 files changed, 15644 insertions(+), 13 deletions(-)
 create mode 100644 kubernetes/helm_charts/monitoring/dashboards/dashboards/data-pipeline-metrics-flink.json
 create mode 100644 kubernetes/helm_charts/monitoring/dashboards/dashboards/lag-dashboard.json
 rename kubernetes/helm_charts/monitoring/dashboards/templates/{dashboards-temp-json-configmap.yaml => dashboards-dp-json-configmap.yaml} (100%)

diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/data-pipeline-metrics-flink.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/data-pipeline-metrics-flink.json
new file mode 100644
index 000000000..abc236a7c
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/data-pipeline-metrics-flink.json
@@ -0,0 +1,5879 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 39,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 74,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 5,
+            "w": 6,
+            "x": 0,
+            "y": 2
+          },
+          "id": 78,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"ingest-router-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Ingestion Router lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 5,
+            "w": 12,
+            "x": 6,
+            "y": 2
+          },
+          "hiddenSeries": false,
+          "id": 76,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"ingest-router-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "IngestRouter lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Ingest Router",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 1
+      },
+      "id": 2,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 0,
+            "y": 2
+          },
+          "id": 4,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_TelemetryExtractorJob_success_batch_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Extractor Success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#E02F44"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 6,
+            "y": 2
+          },
+          "id": 6,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_TelemetryExtractorJob_duplicate_event_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Extractor Duplicates",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#E02F44"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 12,
+            "y": 2
+          },
+          "id": 59,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_TelemetryExtractorJob_success_event_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Raw Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#299c46"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 18,
+            "y": 2
+          },
+          "id": 5,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_TelemetryExtractorJob_failed_batch_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Extractor Failed",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 6
+          },
+          "hiddenSeries": false,
+          "id": 10,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_TelemetryExtractorJob_success_event_count)",
+              "format": "time_series",
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "ExtractorSuccess",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_TelemetryExtractorJob_duplicate_event_count)",
+              "interval": "",
+              "legendFormat": "ExtractorDuplicates",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_TelemetryExtractorJob_failed_batch_count)",
+              "interval": "",
+              "legendFormat": "ExtractorFailed",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Telemetry Extractor",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 6
+          },
+          "hiddenSeries": false,
+          "id": 12,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"telemetry-extractor-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "TelemetryExtractor lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "TelemetryExtractor",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 2
+      },
+      "id": 14,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 0,
+            "y": 3
+          },
+          "id": 16,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_success_event_count[$__range])) + sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_failed_event_count[$__range])) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Raw Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 5,
+            "y": 3
+          },
+          "id": 61,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_unique_event_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Unique Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "decimals": null,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 10,
+            "y": 3
+          },
+          "id": 60,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_duplicate_event_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Duplicate Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 15,
+            "y": 3
+          },
+          "id": 22,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_failed_event_count[$__range]))",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Invalid Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#299c46"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 3
+          },
+          "id": 67,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_failed_event_count[$__range])) / (sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_failed_event_count[$__range])) +sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_validation_success_event_count[$__range]))) * 100",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Invalid Events %",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 0,
+            "y": 7
+          },
+          "id": 21,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_primary_route_success_count[$__range])) + sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_share_item_event_success_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Primary Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 5,
+            "y": 7
+          },
+          "id": 23,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_audit_route_success_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Audit Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 10,
+            "y": 7
+          },
+          "id": 17,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_log_route_success_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Log Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 15,
+            "y": 7
+          },
+          "id": 19,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_share_route_success_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Share Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 7
+          },
+          "id": 18,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_error_route_success_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Error Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 11
+          },
+          "hiddenSeries": false,
+          "id": 25,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_primary_route_success_count)",
+              "interval": "",
+              "legendFormat": "Primary Events",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_log_route_success_count)",
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "Log Events",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_error_route_success_count)",
+              "interval": "",
+              "legendFormat": "Error Events",
+              "refId": "C"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_PipelinePreprocessorJob_audit_route_success_count)",
+              "interval": "",
+              "legendFormat": "Audit Events",
+              "refId": "D"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Pipeline Preprocessor",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 11
+          },
+          "hiddenSeries": false,
+          "id": 29,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"pipeline-preprocessor-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Preprocessor lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Pipeline Preprocessor",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 99,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 2
+          },
+          "id": 100,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_device_cache_hit{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Device meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 2
+          },
+          "id": 101,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_user_cache_hit{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "User meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 2
+          },
+          "id": 102,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_dialcode_cache_hit{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Dialcode meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 2
+          },
+          "id": 103,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_content_cache_hit{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Content meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 2
+          },
+          "id": 104,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_loc_cache_hit{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Location meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#299c46"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 2
+          },
+          "id": 120,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "Expired events",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_events_expired{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "Expired events",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Expired Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 0,
+            "y": 6
+          },
+          "id": 106,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_device_cache_miss{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Device meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 5,
+            "y": 6
+          },
+          "id": 107,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_user_cache_miss{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "User meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 10,
+            "y": 6
+          },
+          "id": 108,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_dialcode_cache_miss{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Dialcode meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 15,
+            "y": 6
+          },
+          "id": 109,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_content_cache_miss{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Content meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 6
+          },
+          "id": 110,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_loc_cache_miss{job=\"de-normalization-primary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Location meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 10
+          },
+          "hiddenSeries": false,
+          "id": 111,
+          "interval": "",
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DenormalizationJob_loc_total{job=\"de-normalization-primary-taskmanager-prometheus\"})",
+              "interval": "",
+              "legendFormat": "Denorm success",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DenormalizationPrimary",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 10
+          },
+          "hiddenSeries": false,
+          "id": 112,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"de-normalization-primary-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DenormalizationPrimary lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "DenormalizationPrimary",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 4
+      },
+      "id": 114,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 1
+          },
+          "id": 115,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_device_cache_hit{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Device meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 1
+          },
+          "id": 116,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_user_cache_hit{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "User meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 1
+          },
+          "id": 117,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_dialcode_cache_hit{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Dialcode meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 1
+          },
+          "id": 118,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_content_cache_hit{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Content meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 1
+          },
+          "id": 119,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_loc_cache_hit{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Location meta success",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#299c46"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 1
+          },
+          "id": 105,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "Expired events",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_events_expired{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "Expired events",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Expired Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 0,
+            "y": 5
+          },
+          "id": 121,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_device_cache_miss{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Device meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 5,
+            "y": 5
+          },
+          "id": 122,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_user_cache_miss{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "User meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 10,
+            "y": 5
+          },
+          "id": 123,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_dialcode_cache_miss{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Dialcode meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 5,
+            "x": 15,
+            "y": 5
+          },
+          "id": 124,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_content_cache_miss{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Content meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 5
+          },
+          "id": 125,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DenormalizationJob_loc_cache_miss{job=\"de-normalization-secondary-taskmanager-prometheus\"}[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Location meta miss",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 9
+          },
+          "hiddenSeries": false,
+          "id": 126,
+          "interval": "",
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DenormalizationJob_loc_total{job=\"de-normalization-secondary-taskmanager-prometheus\"})",
+              "interval": "",
+              "legendFormat": "Denorm success",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DenormalizationSecondary",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 9
+          },
+          "hiddenSeries": false,
+          "id": 127,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"de-normalization-secondary-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DenormalizationSecondarylag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "DenormalizationSecondary",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 5
+      },
+      "id": 44,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 0,
+            "y": 16
+          },
+          "id": 46,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DruidValidatorJob_telemetry_route_success_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Telemetry Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 6,
+            "y": 16
+          },
+          "id": 47,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DruidValidatorJob_summary_route_success_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Summary Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 12,
+            "y": 16
+          },
+          "id": 48,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DruidValidatorJob_validation_failed_message_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Validation Failed",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#299c46",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 6,
+            "x": 18,
+            "y": 16
+          },
+          "id": 49,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(flink_taskmanager_job_task_operator_DruidValidatorJob_duplicate_event_count[$__range]))",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Duplicate Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 20
+          },
+          "hiddenSeries": false,
+          "id": 53,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DruidValidatorJob_telemetry_route_success_count)",
+              "interval": "",
+              "legendFormat": "Telemetry Events",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DruidValidatorJob_summary_route_success_count)",
+              "interval": "",
+              "legendFormat": "Summary Events",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DruidValidatorJob_validation_failed_message_count)",
+              "interval": "",
+              "legendFormat": "Validation failed",
+              "refId": "C"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DruidValidatorJob_duplicate_event_count)",
+              "interval": "",
+              "legendFormat": "Duplicate Events",
+              "refId": "D"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Druid Validator",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 20
+          },
+          "hiddenSeries": false,
+          "id": 52,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"druid-validator-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DruidValidator lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Druid Validator",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 6
+      },
+      "id": 65,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 7
+          },
+          "hiddenSeries": false,
+          "id": 63,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_content_cache_hit)",
+              "legendFormat": "ContentCacheHit",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_content_cache_miss)",
+              "legendFormat": "ContentCacheMiss",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_content_total)",
+              "legendFormat": "ContentTotal",
+              "refId": "C"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_device_cache_hit)",
+              "legendFormat": "DeviceCacheHit",
+              "refId": "D"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_device_cache_miss)",
+              "legendFormat": "DeviceCacheMiss",
+              "refId": "E"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_device_total)",
+              "legendFormat": "DeviceTotal",
+              "refId": "F"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_dialcode_cache_hit)",
+              "legendFormat": "DialcodeCacheHit",
+              "refId": "G"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_dialcode_cache_miss)",
+              "legendFormat": "DialcodeCacheMiss",
+              "refId": "H"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_dialcode_total)",
+              "legendFormat": "DialcodeCacheMiss",
+              "refId": "I"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_user_cache_hit)",
+              "legendFormat": "UserCacheMiss",
+              "refId": "J"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_events_expired)",
+              "legendFormat": "ExpiredEvent",
+              "refId": "K"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_unique_event_count)",
+              "legendFormat": "UniqueEventCount",
+              "refId": "L"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_user_cache_hit)",
+              "legendFormat": "UserCacheHit",
+              "refId": "N"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_user_cache_miss)",
+              "legendFormat": "UserCacheMiss",
+              "refId": "M"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_SummaryDenormalizationJob_user_total)",
+              "legendFormat": "UserTotal",
+              "refId": "O"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "SummaryDenorm ",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 7
+          },
+          "hiddenSeries": false,
+          "id": 66,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max{ job = \"summary-denormalization-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "SummaryDenorm lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "SummaryDenorm",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 7
+      },
+      "id": 71,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 18
+          },
+          "hiddenSeries": false,
+          "id": 69,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_UserCacheUpdaterJobV2_success_message_count)",
+              "interval": "",
+              "legendFormat": "User-Cache-Updater-Success",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "User-Cache-Updater-v2",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 18
+          },
+          "hiddenSeries": false,
+          "id": 72,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"user-cache-updater-v2-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "User-Cache-Updater-lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "User-Cache-Updater-v2 lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "UserCacheUpdaterV2",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 8
+      },
+      "id": 129,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 10
+          },
+          "hiddenSeries": false,
+          "id": 130,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DeviceProfileUpdaterJob_success_event_count)",
+              "format": "time_series",
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "Success",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DeviceProfileUpdaterJob_device_db_update_count)",
+              "interval": "",
+              "legendFormat": "DbUpdate",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DeviceProfileUpdaterJob_failed_event_count)",
+              "interval": "",
+              "legendFormat": "Failed",
+              "refId": "C"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_DeviceProfileUpdaterJob_device_cache_update_count)",
+              "interval": "",
+              "legendFormat": "CacheUpdate",
+              "refId": "D"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DeviceProfileUpdater",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 10
+          },
+          "hiddenSeries": false,
+          "id": 131,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"device-profile-updater-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "DeviceProfileUpdater lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "DeviceProfileUpdater",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 9
+      },
+      "id": 133,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 11
+          },
+          "hiddenSeries": false,
+          "id": 134,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_ContentCacheUpdaterJob_cache_hit_count)",
+              "format": "time_series",
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "Cache Hit",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_ContentCacheUpdaterJob_dial_codes_api_hit_count)",
+              "interval": "",
+              "legendFormat": "DialCode Api Hit",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_ContentCacheUpdaterJob_dial_codes_api_miss_count)",
+              "interval": "",
+              "legendFormat": "DialCode Api Miss",
+              "refId": "C"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_ContentCacheUpdaterJob_dial_codes_cache_hit_count)",
+              "interval": "",
+              "legendFormat": "DialCode Cache Hit",
+              "refId": "D"
+            },
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_ContentCacheUpdaterJob_total_dial_code_count)",
+              "interval": "",
+              "legendFormat": "Total DialCode",
+              "refId": "E"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "ContentCacheUpdater",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Flink-Prometheus",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 11
+          },
+          "hiddenSeries": false,
+          "id": 135,
+          "legend": {
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"content-cache-updater-taskmanager-prometheus\" })",
+              "interval": "",
+              "legendFormat": "Consumer lag",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "ContentCacheUpdater lag",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "ContentCacheUpdater",
+      "type": "row"
+    }
+  ],
+  "refresh": "30s",
+  "schemaVersion": 25,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now/d",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5m"
+    ]
+  },
+  "timezone": "",
+  "title": "Data Pipeline Metrics Flink",
+  "uid": "Ynghyskz",
+  "version": 39
+}
diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/lag-dashboard.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/lag-dashboard.json
new file mode 100644
index 000000000..93cab65d7
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/lag-dashboard.json
@@ -0,0 +1,9757 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 85,
+  "iteration": 1610513908145,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 20,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical:  2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 6
+          },
+          "id": 21,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.flink.kp.events\", endpoint=\"metrics\", instance=\"11.4.35.172:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-75f7894b77-5h8bw\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.raw\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=~\"ntpprod.flink.kp.events\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "logstash Raw events lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical:  2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 6
+          },
+          "id": 113,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry-log.indexer\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.error\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=~\"ntpprod.telemetry-log.indexer\", job=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.error\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "logstash Telemetry Error events lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical:  2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 6
+          },
+          "id": 114,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry-log.indexer\", endpoint=\"metrics\", instance=\"11.4.33.35:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-cpxjn\", service=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.log\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=~\"ntpprod.telemetry-log.indexer\", job=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.log\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "logstash Telemetry log events lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Logstash Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 1
+      },
+      "id": 15,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 6
+          },
+          "id": 16,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"assessment-aggregator-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AssessmentAggregator Lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical:  2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 6
+          },
+          "id": 17,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"activity-aggregate-updater-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ActivityAggUpdater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 6
+          },
+          "id": 18,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"relation-cache-updater-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "RelationCache Updater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 6
+          },
+          "id": 111,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"post-publish-processor-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "PostPublishProcessor lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "KP Flink Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 2
+      },
+      "id": 41,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 3
+          },
+          "id": 42,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-assessment-aggregator-group\", endpoint=\"metrics\", instance=\"11.4.35.172:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-75f7894b77-5h8bw\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.assess\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-assessment-aggregator-group\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AssessmentAggregator Lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical:  2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 3
+          },
+          "id": 43,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-activity-aggregate-group\", endpoint=\"metrics\", instance=\"11.4.35.172:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-75f7894b77-5h8bw\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.coursebatch.job.request\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-activity-aggregate-group\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ActivityAggUpdater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 3
+          },
+          "id": 44,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-relation-cache-updater-group\", endpoint=\"metrics\", instance=\"11.4.35.172:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-75f7894b77-5h8bw\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.content.postpublish.request\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-relation-cache-updater-group\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "RelationCache Updater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 3
+          },
+          "id": 112,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-post-publish-processor-group\", endpoint=\"metrics\", instance=\"11.4.35.172:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-75f7894b77-5h8bw\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.content.postpublish.request\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-post-publish-processor-group\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "PostPublishProcessor Lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "KP Flink Consumer Group Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 80,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50k\nCritical: 100k",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 8
+          },
+          "id": 81,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'course-batch-updater' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CourseBatchUpdater",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 8
+          },
+          "id": 82,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'course-certificate-generator' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CourseCertificateGenerator",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50K\nCritical: 100K",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 8
+          },
+          "id": 83,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'publish-pipeline' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "PublishPipeline",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50K\nCritical: 100K",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 8
+          },
+          "id": 84,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'composite-search-indexer') AND $timeFilter GROUP BY time($__interval) fill(null)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CompositeSearchIndexer",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50K\nCritical: 100k",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 8
+          },
+          "id": 85,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'audit-history-indexer' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AuditHistoryIndexer",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50K\nCritical: 100K",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 8
+          },
+          "id": 86,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'audit-history-indexer' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AuditHistoryIndexer",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold:\nWarning: 50K\nCritical: 100K",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 12
+          },
+          "id": 87,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'audit-event-generator' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AuditEventGenerator",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "InfluxDB_Datapipeline",
+          "description": "Threshold: \nWarning: 50K\nCritical: 100K",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 12
+          },
+          "id": 88,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "groupBy": [
+                {
+                  "params": [
+                    "$__interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "hide": false,
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"consumer_lag\") FROM \"pipeline_metrics\" WHERE (\"job_name\" = 'asset-enrichment' ) AND $timeFilter GROUP BY time($__interval) fill(none)",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "mean"
+                  }
+                ]
+              ],
+              "tags": []
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AssetEnrichment",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "KP Samza Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 4
+      },
+      "id": 2,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 5M\nCritical:  10M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 5
+          },
+          "id": 4,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"ingest-router-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "5000000,10000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Ingestion Router lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 5M\nCritical:  10M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 5
+          },
+          "id": 5,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"telemetry-extractor-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "5000000,10000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryExtractor lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 5
+          },
+          "id": 6,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"pipeline-preprocessor-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Preprocessor lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 5
+          },
+          "id": 8,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"druid-validator-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DruidValidator lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 5
+          },
+          "id": 89,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"de-normalization-primary-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DenormalizationPrimary lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 5
+          },
+          "id": 90,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"de-normalization-secondary-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DenormalizationSecondarylag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 9
+          },
+          "id": 10,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max{endpoint=\"prom\", host=\"device_profile_updater_taskmanager_b48455c9c_b8kxh\", instance=\"11.4.10.171:9251\", job=\"device-profile-updater-taskmanager-prometheus\", job_id=\"5241445b6990eaafb1d29e32d2c31f83\", job_name=\"Device_profile_updater\", namespace=\"flink-production\", operator_id=\"9b2fa66376e7322a8972db73e0d4b7a7\", operator_name=\"Source:_device_profile_consumer\", pod=\"device-profile-updater-taskmanager-b48455c9c-b8kxh\", service=\"device-profile-updater-taskmanager-prometheus\", subtask_index=\"0\", task_attempt_id=\"39505adfe059901294e8c126e5e41a73\", task_attempt_num=\"0\", task_id=\"9b2fa66376e7322a8972db73e0d4b7a7\", task_name=\"Source:_device_profile_consumer\", tm_id=\"ef47173cf137d146ecc2af68e10e794a\"}",
+          "targets": [
+            {
+              "expr": "(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"device-profile-updater-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Device-Profile-Updater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 9
+          },
+          "id": 11,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"content-cache-updater-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Content-Cache-Updater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 9
+          },
+          "id": 13,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max { job = \"user-cache-updater-v2-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "UserCacheUpdaterV2 lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Flink-Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 9
+          },
+          "id": 9,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(flink_taskmanager_job_task_operator_KafkaConsumer_records_lag_max{ job = \"summary-denormalization-taskmanager-prometheus\" })",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryDenorm lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "DP Flink Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 5
+      },
+      "id": 46,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 5M\nCritical:  10M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 6
+          },
+          "id": 47,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-ingest-router-group\", endpoint=\"metrics\", instance=\"11.4.33.39:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-6fc747d9c-gm4lx\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.ingestion\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-ingest-router-group\", job=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.ingestion\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "5000000,10000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Ingestion Router lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 5M\nCritical:  10M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 6
+          },
+          "id": 48,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-telemetry-extractor-group\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.ingest\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-telemetry-extractor-group\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "5000000,10000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Telemetry Extractor lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 6
+          },
+          "id": 49,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-pipeline-preprocessor-group\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.raw\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-pipeline-preprocessor-group\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "PreProcessor lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 6
+          },
+          "id": 51,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-druid-validator-group\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.denorm\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-druid-validator-group\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DruidValidator lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 6
+          },
+          "id": 55,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-telemetry-denorm-primary-group\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.unique.primary\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-telemetry-denorm-primary-group\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DenormalizationPrimary lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 6
+          },
+          "id": 91,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-telemetry-denorm-secondary-group\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.unique.secondary\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-telemetry-denorm-secondary-group\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DenormalizationSecondary lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 10
+          },
+          "id": 53,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-device-profile-updater-group\", endpoint=\"metrics\", instance=\"11.4.33.39:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-6fc747d9c-gm4lx\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.events.deviceprofile\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-device-profile-updater-group\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DeviceProfileUpdater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 10
+          },
+          "id": 54,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-content-cache-updater-group\", endpoint=\"metrics\", instance=\"11.4.33.39:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-6fc747d9c-gm4lx\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.learning.graph.events\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-content-cache-updater-group\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ContentCacheUpdater lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 10
+          },
+          "id": 92,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-user-cache-updater-consumer-group\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.audit\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-user-cache-updater-consumer-group\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "UserCacheUpdaterV2 lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 10
+          },
+          "id": 52,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-summmary-denorm-group\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.derived\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-summmary-denorm-group\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryDenorm lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 10
+          },
+          "id": 165,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod-error-denorm-group\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.error\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroup_lag{consumergroup=\"ntpprod-error-denorm-group\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Error Denorm lag",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "DP Flink Consumer Group Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 6
+      },
+      "id": 23,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 10M\nCritical: 15M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 7
+          },
+          "id": 24,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.ingestion.events.backup\", endpoint=\"metrics\", instance=\"11.4.33.39:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-6fc747d9c-gm4lx\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.ingestion\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.ingestion.events.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "10000000,15000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "IngestionTelemetryBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 7
+          },
+          "id": 28,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.raw.events.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.raw\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.raw.events.backup\", job=\"processing-kafka-exporter\"}) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "RawTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 7
+          },
+          "id": 26,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.failed.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.failed\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.failed.backup\", job=\"processing-kafka-exporter\"}) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "FailedTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 7
+          },
+          "id": 27,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.extractor.duplicate.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.extractor.duplicate\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.extractor.duplicate.backup\", job=\"processing-kafka-exporter\"}) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ExtractorDuplicateEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 7
+          },
+          "id": 34,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.channel.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.denorm\"}",
+          "targets": [
+            {
+              "expr": "sum without (partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.channel.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ChannelTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 7
+          },
+          "id": 30,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.derived.unique.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.derived.unique\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.derived.unique.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DerivedUniqueTelemetryBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 11
+          },
+          "id": 29,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.assess.raw\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.assess.raw\"}",
+          "targets": [
+            {
+              "expr": "sum without (partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.assess.raw\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AssesRawEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 11
+          },
+          "id": 25,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.extractor.failed.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.extractor.failed\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.extractor.failed.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ExtractorFailedEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 11
+          },
+          "id": 32,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.unique.events.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.unique\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.unique.events.backup\", job=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.unique\"}) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "UniqueTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 11
+          },
+          "id": 33,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.summary.channel.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.summary\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.summary.channel.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ChannelEventsSummaryBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshod: \nWarning: 50K\nCritical: 1L",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 11
+          },
+          "id": 56,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.failed.learning.events.backup\", endpoint=\"metrics\", instance=\"11.4.33.39:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-6fc747d9c-gm4lx\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.learning.events.failed\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.failed.learning.events.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "50000,100000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "LearningFailedEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 11
+          },
+          "id": 35,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.denorm.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.denorm\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.denorm.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DenormTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 15
+          },
+          "id": 36,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.events.device.profile.backup\", endpoint=\"metrics\", instance=\"11.4.33.39:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-6fc747d9c-gm4lx\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.events.deviceprofile\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.events.device.profile.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DeviceProfileEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 15
+          },
+          "id": 31,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.duplicate.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.telemetry.duplicate\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.duplicate.backup\", job=\"processing-kafka-exporter\"}) ",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DuplicateTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 2M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 15
+          },
+          "id": 38,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.telemetry.assess.events.backup\", endpoint=\"metrics\", instance=\"11.4.33.39:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-6fc747d9c-gm4lx\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.telemetry.assess\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.telemetry.assess.events.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,2000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AssessTelemetryEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 15M\nCritical: 20M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 15
+          },
+          "id": 39,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.summary.backup\", endpoint=\"metrics\", instance=\"11.4.34.184:9308\", job=\"processing-kafka-exporter\", namespace=\"monitoring\", pod=\"processing-kafka-exporter-5c4f4645d-gqjq7\", service=\"processing-kafka-exporter\", topic=\"ntpprod.druid.events.summary\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.summary.backup\", job=\"processing-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "15000000,20000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "DerivedDenormEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 1M\nCritical: 1.5M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 15
+          },
+          "id": 37,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.learning.graph.events.backup\", endpoint=\"metrics\", instance=\"11.4.33.39:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-6fc747d9c-gm4lx\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.learning.graph.events\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.learning.graph.events.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1000000,1500000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "LearningGraphEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold: \nWarning: 4M\nCritical: 8M",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 15
+          },
+          "id": 57,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "{consumergroup=\"ntpprod.coursebatch.job.request.backup\", endpoint=\"metrics\", instance=\"11.4.33.39:9308\", job=\"ingestion-kafka-exporter\", namespace=\"monitoring\", pod=\"ingestion-kafka-exporter-6fc747d9c-gm4lx\", service=\"ingestion-kafka-exporter\", topic=\"ntpprod.coursebatch.job.request\"}",
+          "targets": [
+            {
+              "expr": "sum without(partition) (kafka_consumergroupzookeeper_lag_zookeeper{consumergroup=~\"$env.coursebatch.job.request.backup\", job=\"ingestion-kafka-exporter\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "4000000,8000000",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CourceBatchEventsBackup",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Secor Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 7
+      },
+      "id": 59,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 8,
+            "w": 24,
+            "x": 0,
+            "y": 8
+          },
+          "hiddenSeries": false,
+          "id": 61,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": false,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "options": {
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(dataproduct_workflowsummarymodel_time_taken_secs)",
+              "interval": "",
+              "legendFormat": "time_taken: {{ subsystem }}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Total Data Products time taken",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "s",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "s",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "datasource": null,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {
+                "align": "left"
+              },
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 0,
+                  "operator": "",
+                  "text": "",
+                  "to": "",
+                  "type": 1,
+                  "value": ""
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "short"
+            },
+            "overrides": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Value #A"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Total"
+                  }
+                ]
+              },
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Value #B"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Total"
+                  }
+                ]
+              }
+            ]
+          },
+          "gridPos": {
+            "h": 5,
+            "w": 11,
+            "x": 0,
+            "y": 16
+          },
+          "id": 63,
+          "options": {
+            "frameIndex": 0,
+            "showHeader": true,
+            "sortBy": [
+              {
+                "desc": true,
+                "displayName": "report_date"
+              }
+            ]
+          },
+          "pluginVersion": "7.0.6",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(dataproduct_workflowsummarymodel_input_events[${__range_s}s])) by (report_date)",
+              "format": "table",
+              "hide": false,
+              "instant": true,
+              "interval": "",
+              "legendFormat": "input_events",
+              "refId": "A"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Total Data Products Input count",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Time": true,
+                  "endpoint": true,
+                  "instance": true,
+                  "namespace": true,
+                  "service": true,
+                  "status": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            }
+          ],
+          "type": "table"
+        },
+        {
+          "datasource": null,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {
+                "align": "left"
+              },
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 0,
+                  "operator": "",
+                  "text": "",
+                  "to": "",
+                  "type": 1,
+                  "value": ""
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "short"
+            },
+            "overrides": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Value #A"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Total"
+                  }
+                ]
+              },
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Value #B"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Total"
+                  }
+                ]
+              }
+            ]
+          },
+          "gridPos": {
+            "h": 5,
+            "w": 13,
+            "x": 11,
+            "y": 16
+          },
+          "id": 65,
+          "options": {
+            "frameIndex": 0,
+            "showHeader": true,
+            "sortBy": [
+              {
+                "desc": true,
+                "displayName": "report_date"
+              }
+            ]
+          },
+          "pluginVersion": "7.0.6",
+          "targets": [
+            {
+              "expr": "sum(sum_over_time(dataproduct_workflowsummarymodel_output_events[${__range_s}s])) by (report_date)",
+              "format": "table",
+              "hide": false,
+              "instant": true,
+              "interval": "",
+              "legendFormat": "input_events",
+              "refId": "A"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Total Data Products Output count",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Time": true,
+                  "endpoint": true,
+                  "instance": true,
+                  "namespace": true,
+                  "service": true,
+                  "status": true
+                },
+                "indexByName": {},
+                "renameByName": {}
+              }
+            }
+          ],
+          "type": "table"
+        }
+      ],
+      "title": "WFS Metrics",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 8
+      },
+      "id": 73,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  audit-rollup-syncts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 9
+          },
+          "id": 74,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"rollup\", exported_job=\"audit-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"rollup\",exported_job=\"audit-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AuditRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  error-rollup-syncts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 9
+          },
+          "id": 75,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"rollup\", exported_job=\"error-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"rollup\",exported_job=\"error-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ErrorRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  summary-distinct-counts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 9
+          },
+          "id": 76,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"rollup\", exported_job=\"summary-distinct-counts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"rollup\",exported_job=\"summary-distinct-counts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryDistinctCounts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  summary-rollup-syncts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 9
+          },
+          "id": 77,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"rollup\", exported_job=\"summary-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"rollup\",exported_job=\"summary-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  summary-rollup-syncts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 9
+          },
+          "id": 78,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"rollup\", exported_job=\"telemetry-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"rollup\",exported_job=\"telemetry-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Druid Rollup Cluster DataSource Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 9
+      },
+      "id": 67,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "DataSource name: summary-events",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 10
+          },
+          "id": 69,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"raw\", exported_job=\"summary-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"raw\",exported_job=\"summary-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Summary-Events",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name: telemetry-events-syncts",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 10
+          },
+          "id": 70,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"raw\", exported_job=\"telemetry-events-syncts\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"raw\",exported_job=\"telemetry-events-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryEventsSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Datasource name:  telemetry-feedback-events",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 10
+          },
+          "id": 71,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_ingest_kafka_lag{cluster=\"raw\", exported_job=\"telemetry-feedback-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8090\", job=\"druid-exporter\", role=\"druid/overlord\"}",
+          "targets": [
+            {
+              "expr": "druid_ingest_kafka_lag{cluster=\"raw\",exported_job=\"telemetry-feedback-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryFeedbackEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Druid Raw Cluster DataSource Lag",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 10
+      },
+      "id": 94,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 23
+          },
+          "id": 95,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"audit-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"audit-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "AuditRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 23
+          },
+          "id": 96,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"error-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"error-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ErrorRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 23
+          },
+          "id": 97,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"summary-distinct-counts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"summary-distinct-counts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryDistinctCounts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 23
+          },
+          "id": 98,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"summary-monthly-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"summary-monthly-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryMonthlyRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 23
+          },
+          "id": 99,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"summary-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"summary-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 23
+          },
+          "id": 100,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"rollup\", exported_job=\"telemetry-rollup-syncts\", instance=\"11.4.0.53:9108\", ip=\"11_4_0_53:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"rollup\",exported_job=\"telemetry-rollup-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryRollupSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Druid Rolllup Cluster Segment Unavailable Count",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 11
+      },
+      "id": 102,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 16
+          },
+          "id": 103,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"content-model-snapshot\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"content-model-snapshot\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ContentModelSnapshot",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 16
+          },
+          "id": 104,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"offline-desktop-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"offline-desktop-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "OfflineDesktopEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 8,
+            "y": 16
+          },
+          "id": 105,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"pipeline-metrics\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"pipeline-metrics\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "PipelineMetrics",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 12,
+            "y": 16
+          },
+          "id": 106,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"summary-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"summary-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "SummaryEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 16,
+            "y": 16
+          },
+          "id": 107,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"telemetry-error-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"telemetry-error-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryErrorEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 20,
+            "y": 16
+          },
+          "id": 108,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"telemetry-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"telemetry-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 0,
+            "y": 20
+          },
+          "id": 109,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"telemetry-events-syncts\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"telemetry-events-syncts\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryEventsSyncts",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#73BF69",
+            "rgba(237, 129, 40, 0.89)",
+            "#d44a3a"
+          ],
+          "datasource": "Prometheus",
+          "description": "Threshold:\nCritical: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 4,
+            "w": 4,
+            "x": 4,
+            "y": 20
+          },
+          "id": 110,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "druid_segment_unavailable_count{cluster=\"raw\", exported_job=\"telemetry-feedback-events\", instance=\"11.4.3.41:9108\", ip=\"11_4_3_41:8081\", job=\"druid-exporter\", role=\"druid/coordinator\"}",
+          "targets": [
+            {
+              "expr": "druid_segment_unavailable_count{cluster=\"raw\",exported_job=\"telemetry-feedback-events\"}",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,1",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "TelemetryFeedbackEvents",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Druid Raw Cluster Segment Unavailable Count",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 12
+      },
+      "id": 116,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 13
+          },
+          "id": 117,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"derived-telemetry-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "derived-telemetry-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 13
+          },
+          "id": 123,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"derived-denorm-events-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "derived-denorm-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 13
+          },
+          "id": 119,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"channel-summary-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-summary-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 13
+          },
+          "id": 120,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"assess-events-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "assess-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 13
+          },
+          "id": 121,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"assess-raw-events-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "assess-raw-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 20,
+            "y": 13
+          },
+          "id": 122,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"device-profile-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "device-profile-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 16
+          },
+          "id": 118,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"learning-events-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "1,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "learning-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 16
+          },
+          "id": 124,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"learning-failed-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "learning-failed-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 16
+          },
+          "id": 125,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"content-consumption-events-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "content-consumption-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 16
+          },
+          "id": 126,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"failed-telemetry-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "failed-telemetry-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 16
+          },
+          "id": 127,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"extractor-duplicate-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "extractor-duplicate-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 1",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 20,
+            "y": 16
+          },
+          "id": 128,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"extractor-failed-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "extractor-failed-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 8",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 0,
+            "y": 19
+          },
+          "id": 129,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"channel-telemetry-backup-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "channel-telemetry-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 8",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 4,
+            "y": 19
+          },
+          "id": 142,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"raw-telemetry-backup-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "raw-telemetry-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 4",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 8,
+            "y": 19
+          },
+          "id": 137,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"ingestion-telemetry-backup-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "ingestion-telemetry-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 8",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 12,
+            "y": 19
+          },
+          "id": 150,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"denorm-events-backup-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "denorm-events-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": true,
+          "colors": [
+            "#d44a3a",
+            "rgba(237, 129, 40, 0.89)",
+            "#73BF69"
+          ],
+          "datasource": "Prometheus",
+          "description": "Expected running process count: 8",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 4,
+            "x": 16,
+            "y": 19
+          },
+          "id": 157,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false,
+            "ymax": null,
+            "ymin": null
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"unique-telemetry-backup-.+\"})",
+              "instant": true,
+              "interval": "",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "0,0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "unique-telemetry-backup",
+          "type": "singlestat",
+          "valueFontSize": "120%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        }
+      ],
+      "title": "Secor Process",
+      "type": "row"
+    }
+  ],
+  "refresh": false,
+  "schemaVersion": 25,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "ntpprod",
+          "value": "ntpprod"
+        },
+        "hide": 2,
+        "label": "",
+        "name": "env",
+        "options": [
+          {
+            "selected": true,
+            "text": "ntpprod",
+            "value": "ntpprod"
+          }
+        ],
+        "query": "ntpprod",
+        "skipUrlSync": false,
+        "type": "constant"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ]
+  },
+  "timezone": "",
+  "title": "Lag Dashboard",
+  "uid": "vfdQRdtM",
+  "version": 128
+}
diff --git a/kubernetes/helm_charts/monitoring/dashboards/templates/dashboards-temp-json-configmap.yaml b/kubernetes/helm_charts/monitoring/dashboards/templates/dashboards-dp-json-configmap.yaml
similarity index 100%
rename from kubernetes/helm_charts/monitoring/dashboards/templates/dashboards-temp-json-configmap.yaml
rename to kubernetes/helm_charts/monitoring/dashboards/templates/dashboards-dp-json-configmap.yaml
diff --git a/kubernetes/helm_charts/monitoring/dashboards/values.yaml b/kubernetes/helm_charts/monitoring/dashboards/values.yaml
index 1bb051533..9eff6dc80 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/values.yaml
+++ b/kubernetes/helm_charts/monitoring/dashboards/values.yaml
@@ -385,20 +385,15 @@ dashboards:
        file: dashboards/kp-flink-jobs-metrics-dashboard.json
 
 dashboards1:
-   temporary:
-     dashboard01:
-       file: dashboards/service-availability.json
-     dashboard02:
-       file: dashboards/container-details-DS1.json
-     dashboard03:
-       file: dashboards/conatainer-details-DS2.json
-     dashboard04:
-       file: dashboards/host-details-swarm1.json
-     dashboard05:
-       file: dashboards/host-details-swarm2.json
-     dashboard06:
+   data-pipeline:
+     lag-dashboard:
+       file: dashboards/lag-dashboard.json
+     flink-jobs:
+       file: dashboards/data-pipeline-metrics-flink.json
+   server:
+     service-memory:
        file: dashboards/service-memory.json
-     dashboard07:
+     node-exporter:
        file: dashboards/node-exporter.json
 
 dashboards2:

From 4e0894436c9f3a7337c8b4a9dd8f1106f96708af Mon Sep 17 00:00:00 2001
From: kaliraja <34502260+Kaali09@users.noreply.github.com>
Date: Wed, 13 Jan 2021 12:17:06 +0530
Subject: [PATCH 125/184] Issue: #0000: removed the duplicate configmap block
 (#2156)

---
 .../core/nodebb/templates/deployment.yaml     | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
index 46b2eb8a4..3b70382da 100644
--- a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
@@ -50,25 +50,6 @@ spec:
 {{ toYaml .Values.readinessProbe | indent 10 }}
         {{- end }}
 
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: nodebb-config-json
-data:
-  config.json: |-
-     {
-         "url": "{{ .Values.nodebb_url }}",
-         "secret": "100101",
-         "database": "mongo",
-         "port": "4567",
-         "mongo": {
-             "uri": "mongodb://{{ .Values.mongo_nodebb_host }}",
-             "username": "",
-             "password": "",
-         }
-     }
-
 ---
 apiVersion: v1
 kind: Service

From 558d4634d07454691489dbc6ffd292e0337c2f98 Mon Sep 17 00:00:00 2001
From: Rajesh Kumaravel <rajesh.kumaravel@tarento.com>
Date: Wed, 13 Jan 2021 17:52:52 +0530
Subject: [PATCH 126/184] Issue #SB-22354 fix: Added env variable for portal
 session secret key (#2157)

* Issue #SB-20650 fix: Added anonymous user TTL value

* Issue #SB-20650 fix: Updated anonymous user TTL to 30 minutes

* Issue #SB-22354 fix: Added env variable for API whitelist flag

* Issue #SB-22354 fix: Added env variable for portal session secret key
---
 ansible/roles/stack-sunbird/templates/sunbird_player.env | 6 ++++++
 private_repo/ansible/inventory/dev/Core/secrets.yml      | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index 5270de2f1..058f5ceb8 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -147,3 +147,9 @@ sunbird_anonymous_session_ttl={{sunbird_anonymous_session_ttl|default(1800000)}}
 
 # api whitelisting for sunbird portal
 sunbird_enable_api_whitelist={{sunbird_enable_api_whitelist|default('true')}}
+
+# sunbird session secret key
+# Changing the secret value will invalidate all existing sessions.
+# In order to rotate the secret without invalidating sessions, provide an array of secrets,
+# with the new secret as first element of the array, and followed by previous secrets.
+sunbird_portal_session_secret={{sunbird_portal_session_secret}}
\ No newline at end of file
diff --git a/private_repo/ansible/inventory/dev/Core/secrets.yml b/private_repo/ansible/inventory/dev/Core/secrets.yml
index 3a80841d6..199c25f91 100644
--- a/private_repo/ansible/inventory/dev/Core/secrets.yml
+++ b/private_repo/ansible/inventory/dev/Core/secrets.yml
@@ -115,5 +115,11 @@ core_vault_kibana_google_client_id:
 core_vault_kibana_google_client_secret: 
 core_vault_kibana_cookie_secret: kibanaoauth # Cookie secret for kibana Oauth
 
+# sunbird session secret key
+# Changing the secret value will invalidate all existing sessions.
+# In order to rotate the secret without invalidating sessions, provide an array of secrets,
+# with the new secret as first element of the array, and followed by previous secrets.
+sunbird_portal_session_secret:
+
 # !!!!! DO NOT UPDATE VARS BELOW THIS !!!
 # ***************************************************************************** #

From 1d13858a4ec7454f7063f7161e93569d4e3af90d Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <yravinderkumar33@gmail.com>
Date: Fri, 15 Jan 2021 13:31:26 +0530
Subject: [PATCH 127/184] Issue #SB-22405 feat: updating the pdata version.
 (#2160)

---
 .../artifacts/sunbird/login/resources/js/telemetry_service.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
index 30d62adb7..1fc0fd197 100644
--- a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
+++ b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -2506,7 +2506,7 @@ if(client_id.toLowerCase() === 'android'){
     "telemetry": {
       "pdata": {
         "id": pdataId,
-        "ver": "3.5.0",
+        "ver": "3.6.0",
         "pid": "sunbird-portal"
       }
     }

From 5ae50392de2aea4e0acc876516d57bbe970d5812 Mon Sep 17 00:00:00 2001
From: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Date: Fri, 15 Jan 2021 13:48:23 +0530
Subject: [PATCH 128/184] SB-21899 added form api details (#2158)

* SB-21121 limiting feeds to 30

* SB-21121 limiting feeds to 30

* SB-21899 added form api details
---
 .../roles/stack-sunbird/templates/sunbird_learner-service.env   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
index a03b1c5b4..4b3828c4c 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
@@ -112,6 +112,8 @@ sunbird_otp_allowed_attempt={{sunbird_otp_allowed_attempt|default(2)}}
 SUNBIRD_KAFKA_URL={{kafka_urls}}
 ENV_NAME={{env_name}}
 notification_service_base_url=http://notification-service:9000
+form_api_endpoint={{form_api_endpoint | default(/api/data/v1/form/read)}}
+form_api_base_url={{sunbird_portal_base_url}}
 # Release-3.4.0
 feed_limit={{feed_limit | default(30)}}
 

From 9700bb72eba7acf8332ce3ed6bd52b0fc425bdd1 Mon Sep 17 00:00:00 2001
From: Kumar Gauraw <gaurawk@ilimi.in>
Date: Fri, 15 Jan 2021 14:35:13 +0530
Subject: [PATCH 129/184] Issue #DP-1528 fix: updated config (#2161)

---
 .../stack-sunbird/templates/content-service_application.conf    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index c48ecb69b..3e9738994 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -471,7 +471,7 @@ languageCode {
 }
 composite {
   search {
-    url : "{{ proto }}://{{ proxy_server_name }}/action/composite/v3/search"
+    url : "http://search-service.{{namespace}}.svc.cluster.local:9000/v3/search"
   }
 }
 cloud_storage_type: "azure"

From 4fb52c9c2b5eb256b3dab3899627b1a232d16d32 Mon Sep 17 00:00:00 2001
From: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Date: Mon, 18 Jan 2021 10:43:26 +0530
Subject: [PATCH 130/184] SB-21899 modified string value (#2162)

* SB-21899 modified string value
---
 .../roles/stack-sunbird/templates/sunbird_learner-service.env   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
index 4b3828c4c..2b3c5b1a1 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
@@ -112,7 +112,7 @@ sunbird_otp_allowed_attempt={{sunbird_otp_allowed_attempt|default(2)}}
 SUNBIRD_KAFKA_URL={{kafka_urls}}
 ENV_NAME={{env_name}}
 notification_service_base_url=http://notification-service:9000
-form_api_endpoint={{form_api_endpoint | default(/api/data/v1/form/read)}}
+form_api_endpoint={{form_api_endpoint | default('/api/data/v1/form/read')}}
 form_api_base_url={{sunbird_portal_base_url}}
 # Release-3.4.0
 feed_limit={{feed_limit | default(30)}}

From 614a26ead134a728b87e122f5ad57d184729b747 Mon Sep 17 00:00:00 2001
From: Kumar Gauraw <gaurawk@ilimi.in>
Date: Mon, 18 Jan 2021 11:59:04 +0530
Subject: [PATCH 131/184] Issue #24 feat: added new primary category (#2163)

---
 .../stack-sunbird/templates/content-service_application.conf    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index fa65add72..82bbb3c4e 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -569,7 +569,7 @@ channel {
     additionalcategories=["Classroom Teaching Video", "Concept Map", "Curiosity Question Set", "Experiential Resource", "Explanation Video", "Focus Spot", "Learning Outcome Definition", "Lesson Plan", "Marking Scheme Rubric", "Pedagogy Flow", "Previous Board Exam Papers", "TV Lesson", "Textbook"]
   }
   collection {
-    primarycategories=["Content Playlist", "Course", "Digital Textbook"]
+    primarycategories=["Content Playlist", "Course", "Digital Textbook", "Question paper"]
     additionalcategories=["Textbook", "Lesson Plan"]
   }
   asset {

From e615309d161118351faa6b2f17515027729d3e94 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Mon, 18 Jan 2021 11:04:38 +0000
Subject: [PATCH 132/184] revert cassandra backup name to YYYYMMDD (#2165)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 ansible/roles/cassandra-backup/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/cassandra-backup/tasks/main.yml b/ansible/roles/cassandra-backup/tasks/main.yml
index 86e53195a..c9313f095 100755
--- a/ansible/roles/cassandra-backup/tasks/main.yml
+++ b/ansible/roles/cassandra-backup/tasks/main.yml
@@ -14,7 +14,7 @@
     mode: 0755
 
 - set_fact:
-    cassandra_backup_gzip_file_name: "cassandra-backup-{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}-{{ ansible_hostname }}-new"
+    cassandra_backup_gzip_file_name: "cassandra-backup-{{ lookup('pipe', 'date +%Y%m%d') }}-{{ ansible_hostname }}-new"
 
 - name: run the backup script
   become: yes

From 51302fa709ee609431d18384ae4520d35cdcfc88 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <yravinderkumar33@gmail.com>
Date: Mon, 18 Jan 2021 17:26:23 +0530
Subject: [PATCH 133/184] Issue #SB-22405 feat: adding missing telemetries.
 (#2166)

* Issue #SB-22405 feat: updating the pdata version.

* Issue #SB-22405 fix: adding missing telemetry in the login pages..
---
 ansible/artifacts/sunbird/login/login-reset-password.ftl  | 2 +-
 ansible/artifacts/sunbird/login/login.ftl                 | 6 +++---
 .../sunbird/login/resources/js/telemetry_service.js       | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ansible/artifacts/sunbird/login/login-reset-password.ftl b/ansible/artifacts/sunbird/login/login-reset-password.ftl
index 839c4c0a1..363abd818 100644
--- a/ansible/artifacts/sunbird/login/login-reset-password.ftl
+++ b/ansible/artifacts/sunbird/login/login-reset-password.ftl
@@ -39,7 +39,7 @@
                         <input type="text" id="username" class="mt-8" name="username" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" autofocus/>
                     </div>
                     <div class="field">
-                        <button id="login" class="sb-btn sb-btn-normal sb-btn-primary width-100">
+                        <button id="login" onclick="javascript:makeDivUnclickable()" class="sb-btn sb-btn-normal sb-btn-primary width-100">
                         ${msg("doReset")}
                         </button>
                     </div>
diff --git a/ansible/artifacts/sunbird/login/login.ftl b/ansible/artifacts/sunbird/login/login.ftl
index a7824bbf1..f3963fe47 100644
--- a/ansible/artifacts/sunbird/login/login.ftl
+++ b/ansible/artifacts/sunbird/login/login.ftl
@@ -64,14 +64,14 @@
                     </div>
                     <div class="forgot-password">
                       <#if realm.resetPasswordAllowed>
-                        <a id="fgtKeycloakFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:storeLocation(); javascript:makeDivUnclickable()" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a>
-                        <div id="fgtPortalFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:forgetPassword('/recover/identify/account');javascript:makeDivUnclickable()">${msg("doForgotPassword")}</div>
+                        <a id="fgtKeycloakFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:storeLocation(); javascript:makeDivUnclickable(); javascript:storeForgotPasswordLocation(event);" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a>
+                        <div id="fgtPortalFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:makeDivUnclickable(); javascript:createTelemetryEvent(event); javascript:forgetPassword('/recover/identify/account');">${msg("doForgotPassword")}</div>
                       </#if>
                     </div>
                     </div>
 
                     <div class="field mb-8">
-                        <button id="login" class="mt-24 sb-btn sb-btn-normal sb-btn-primary width-100">${msg("login")}</button>
+                        <button id="login" onclick="doLogin(event)" class="mt-24 sb-btn sb-btn-normal sb-btn-primary width-100">${msg("login")}</button>
                     </div>
                   <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??>
                     <div id="kc-registration" class="field">
diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
index 1fc0fd197..7e1a5c626 100644
--- a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
+++ b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -3199,4 +3199,12 @@ var matchPassword = () => {
 	});
 }
 
+var backToApplication = () => {
+	var redirect_uri = getValueFromSession('redirect_uri');
+	if (redirect_uri) {
+		var updatedQuery = redirect_uri.split('?')[0];
+		window.location.href = updatedQuery;
+	}
+}
+
 //})();

From e331baa7191aaaa825ced7602634a7c4378d109c Mon Sep 17 00:00:00 2001
From: Kumar Gauraw <gaurawk@ilimi.in>
Date: Mon, 18 Jan 2021 18:11:25 +0530
Subject: [PATCH 134/184] Issue #24 feat: added new content primary category
 (#2169)

---
 .../stack-sunbird/templates/content-service_application.conf    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index 82bbb3c4e..001706ddc 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -565,7 +565,7 @@ objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_s
 #Default objectCategory mapping for channel
 channel {
   content{
-    primarycategories=["Course Assessment", "eTextbook", "Explanation Content", "Learning Resource", "Practice Question Set", "Teacher Resource"]
+    primarycategories=["Course Assessment", "eTextbook", "Explanation Content", "Learning Resource", "Practice Question Set", "Teacher Resource", "Exam Question"]
     additionalcategories=["Classroom Teaching Video", "Concept Map", "Curiosity Question Set", "Experiential Resource", "Explanation Video", "Focus Spot", "Learning Outcome Definition", "Lesson Plan", "Marking Scheme Rubric", "Pedagogy Flow", "Previous Board Exam Papers", "TV Lesson", "Textbook"]
   }
   collection {

From bd9c2d12ef33e9a1dfdea1bd8fd1beedef94eac8 Mon Sep 17 00:00:00 2001
From: Swayangjit Prasad Parida <swayangjit029@gmail.com>
Date: Mon, 18 Jan 2021 18:44:02 +0530
Subject: [PATCH 135/184] Issue #SB-22564 chore: Added disccussion APIs to the
 mobile device groups. (#2167)

---
 ansible/roles/kong-consumer/defaults/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/roles/kong-consumer/defaults/main.yml b/ansible/roles/kong-consumer/defaults/main.yml
index 4e8bec8ca..03025af13 100644
--- a/ansible/roles/kong-consumer/defaults/main.yml
+++ b/ansible/roles/kong-consumer/defaults/main.yml
@@ -30,6 +30,7 @@ mobile_device_groups:
   - groupAccess
   - groupAdmin
   - refreshTokenCreate
+  - discussionAccess
 
 kong_all_consumer_groups:
   - announcementAccess

From 6868a462a62f04e50681f2d5712d86c342b35d05 Mon Sep 17 00:00:00 2001
From: harishkumar gangula <harish@sanketika.in>
Date: Wed, 20 Jan 2021 11:21:43 +0530
Subject: [PATCH 136/184] Issue #SB-22330 doc: Added new FAQ's

---
 utils/DesktopFAQ/faq-as.json | 24 +++++++++++++++------
 utils/DesktopFAQ/faq-bn.json | 28 +++++++++++++++++-------
 utils/DesktopFAQ/faq-en.json | 28 ++++++++++++++++++------
 utils/DesktopFAQ/faq-gu.json | 32 ++++++++++++++++++++-------
 utils/DesktopFAQ/faq-hi.json | 20 +++++++++++++++--
 utils/DesktopFAQ/faq-kn.json | 26 ++++++++++++++++------
 utils/DesktopFAQ/faq-ml.json | 36 ++++++++++++++++++++-----------
 utils/DesktopFAQ/faq-mr.json | 28 +++++++++++++++++-------
 utils/DesktopFAQ/faq-or.json | 30 ++++++++++++++++++++------
 utils/DesktopFAQ/faq-pa.json | 28 ++++++++++++++++++------
 utils/DesktopFAQ/faq-ta.json | 32 ++++++++++++++++++++-------
 utils/DesktopFAQ/faq-te.json | 42 +++++++++++++++++++++++++-----------
 utils/DesktopFAQ/faq-ur.json | 32 ++++++++++++++++++++-------
 13 files changed, 287 insertions(+), 99 deletions(-)

diff --git a/utils/DesktopFAQ/faq-as.json b/utils/DesktopFAQ/faq-as.json
index 243f8c5a4..b3dc5be8f 100644
--- a/utils/DesktopFAQ/faq-as.json
+++ b/utils/DesktopFAQ/faq-as.json
@@ -9,16 +9,16 @@
       "description": "আপুনি ইউটিউব কনটেণ্ট নিশ্চয় ডাউনল’ড কৰিলে। ইউটিউব কনটেণ্ট আপুনি কেৱল অনলাইন হৈ থকা অৱস্থাতহে চলাব পাৰিব। কম্পিউটাৰটো ইণ্টাৰনেটৰ সৈতে সংযোগ কৰক আৰু পুনৰ চেষ্টা কৰক।"
     },
     {
-      "topic": "মই মোৰ DIKSHA ডেস্কটপ এপটো আপডেট কৰাৰ প্ৰয়োজন হৈছে",
+      "topic": "মই মোৰ SUNBIRD ডেস্কটপ এপটো আপডেট কৰাৰ প্ৰয়োজন হৈছে",
       "description": "আপোনাৰ কম্পিউটাৰটো ইণ্টাৰনেটৰ সৈতে সংযোগ কৰক আৰু শেহতীয়া এপ সংস্কৰণৰ বাবে https://staging.sunbirded.org/desktop/latest পৰীক্ষা কৰক"
     },
     {
       "topic": "ইণ্টাৰনেট সংযোগ থকা লেপটপৰ সৈতে মোৰ প্ৰৱেশাধিকাৰ নাই, কিন্তু মই ডেস্কটপ এপত বিষয়বস্তু যোগ দিব আৰু আপডেট কৰিব বিচাৰোঁ",
-      "description": "যদি আপোনাৰ এটা ম’বাইল ফোন আছে, তেন্তে গুগল প্লে’ষ্ট’ৰৰ পৰা DIKSHA ম’বাইল এপটো ডাউনল’ড কৰক।\nএপটোত বিষয়বস্তুৰ বাবে ব্ৰাউজ কৰক।\nDIKSHA লাইব্ৰেৰীৰ পৰা বিষয়বস্তু ডাউনল’ড কৰক।\nএয়া এটা পে’নড্ৰাইভ বা SD কাৰ্ডলৈ ক’পি কৰক আৰু ইয়াক DIKSHA ডেস্কটপ এপত আপল’ড কৰক।"
+      "description": "যদি আপোনাৰ এটা ম’বাইল ফোন আছে, তেন্তে গুগল প্লে’ষ্ট’ৰৰ পৰা SUNBIRD ম’বাইল এপটো ডাউনল’ড কৰক।\nএপটোত বিষয়বস্তুৰ বাবে ব্ৰাউজ কৰক।\nSUNBIRD লাইব্ৰেৰীৰ পৰা বিষয়বস্তু ডাউনল’ড কৰক।\nএয়া এটা পে’নড্ৰাইভ বা SD কাৰ্ডলৈ ক’পি কৰক আৰু ইয়াক SUNBIRD ডেস্কটপ এপত আপল’ড কৰক।"
     },
     {
       "topic": "মই এটা বিশেষ বিষয়ৰ বাবে বিষয়বস্তু বিচাৰি পোৱা নাই, নতুবা মই অপ্ৰাসংগিক বিষয়বস্তু বিচাৰি পাইছোঁ",
-      "description": "বিষয়বস্তুৰ সন্ধান কৰিবলৈ DIKSHAৰ অনলাইন লাইব্ৰেৰী ব্ৰাউজ কৰক। তেতিয়াও যদি এয়া উপলব্ধ নোহোৱাকৈ থাকে, তেন্তে বিষয়বস্তু সম্পৰ্কে আপোনাৰ মতামত ৰাজ্যিক SCERTলৈ প্ৰেৰণ কৰক"
+      "description": "বিষয়বস্তুৰ সন্ধান কৰিবলৈ SUNBIRDৰ অনলাইন লাইব্ৰেৰী ব্ৰাউজ কৰক। তেতিয়াও যদি এয়া উপলব্ধ নোহোৱাকৈ থাকে, তেন্তে বিষয়বস্তু সম্পৰ্কে আপোনাৰ মতামত ৰাজ্যিক SCERTলৈ প্ৰেৰণ কৰক"
     },
     {
       "topic": "এপটো বৰ লেহেমীয়া গতিৰ",
@@ -37,12 +37,24 @@
       "description": "ক’পি কৰিবলৈ লগা সময় বিষয়বস্তুটোৰ ফাইলৰ আকাৰৰ ওপৰত নিৰ্ভৰ কৰে। কিছুমান বৃহৎ আকাৰৰ পাঠ্যপুথি ক’পি কৰোঁতে সময় লাগে। আমি পৰামৰ্শ দিও যে আপুনি প্ৰক্ৰিয়াটো মাজতে বন্ধ কৰি নিদিব। এনে কৰাৰ ফলত ফাইলবোৰ সংগতিহীন হৈ পৰিব। "
     },
     {
-      "topic": "DIKSHAৰ বিষয়বস্তুৰ বাবে মোৰ কম্পিউটাৰত কোনো খালি ঠাই নাই",
+      "topic": "SUNBIRDৰ বিষয়বস্তুৰ বাবে মোৰ কম্পিউটাৰত কোনো খালি ঠাই নাই",
       "description": "আপোনাৰ কম্পিউটাৰত ঠাই খালি কৰিবলৈ এপটোৰ মাই ডাউনল’ডছ্ টেবটোৰ পৰা ডাউনল’ড হৈ থকা বিষয়বস্তু ডিলিট কৰক"
     },
     {
-      "topic": "মোৰ উবান্তু ছিষ্টেমত DIKSHA ডেস্কটপ এপ্লিকেশ্বন ইনষ্টল কৰিব পৰা নাই",
-      "description": "<p>আপোনাৰ উবান্তু ছিষ্টেমত DIKSHA ডেস্কটপ এপ্লিকেশ্বন ইনষ্টল কৰিবলৈ:</p>\n<p>1) আপোনাৰ টাৰ্মিনেল খোলক</p>\n<p>2) exe ফাইলটো য’ত ডাউনল’ড হৈছে তাত নামপঞ্জী সলনি কৰিবলৈ cd <location> নিৰ্দেশটো চলাওক। উদাহৰণস্বৰূপে, যদি exe ডাউনল’ড ফ’ল্ডাৰত ছে’ভ হৈ আছে, তেন্তে cd Downloads নিৰ্দেশটো চলাওক</p>\n<p>3) sudo dpkg -i <filename> নিৰ্দেশটো চলাওক</p>\n<p>এই নিৰ্দেশটো সফলতাৰে চলালে এপ্লিকেশ্বনটো আৰম্ভ হয়</p>"
+      "topic": "মোৰ উবান্তু ছিষ্টেমত SUNBIRD ডেস্কটপ এপ্লিকেশ্বন ইনষ্টল কৰিব পৰা নাই",
+      "description": "<p>আপোনাৰ উবান্তু ছিষ্টেমত SUNBIRD ডেস্কটপ এপ্লিকেশ্বন ইনষ্টল কৰিবলৈ:</p>\n<p>1) আপোনাৰ টাৰ্মিনেল খোলক</p>\n<p>2)  exe ফাইলটো য’ত ডাউনল’ড হৈছে তাত নামপঞ্জী সলনি কৰিবলৈ cd <location> নিৰ্দেশটো চলাওক।  উদাহৰণস্বৰূপে, যদি exe ডাউনল’ড ফ’ল্ডাৰত ছে’ভ হৈ আছে, তেন্তে cd Downloads নিৰ্দেশটো চলাওক</p>\n<p>3) sudo dpkg -i <filename> নিৰ্দেশটো চলাওক</p>\n<p>এই নিৰ্দেশটো সফলতাৰে চলালে এপ্লিকেশ্বনটো আৰম্ভ হয়</p>"
+    },
+    {
+      "topic": "মই SUNBIRDত পঞ্জীয়ন কৰিব বিচাৰোঁ",
+      "description": "SUNBIRDত চাইন আপ কৰিবলৈ:\n<ul>\n      <li>    <a href =\"https://staging.sunbirded.org/explore\"target=\"_blank\">Explore SUNBIRD </a> </li>লৈ যাওক\n <li>আপুনি শিক্ষক নে শিক্ষাৰ্থী বাছনি কৰক</li>\n <li>আপোনাৰ অৱস্থানৰ সবিশেষ আপডেট কৰক</li>\n <li>প্ৰ’ফাইল চিহ্নটোত ক্লিক কৰক</li>\n <li><b>Login</b>ত ক্লিক কৰক</li>\n <li> লগ ইন স্ক্ৰীণত <b>Register here</b> ক্লিক কৰক</li>\n <li>কেনেকৈ পঞ্জীয়ন কৰে তাৰ সবিশেষৰ বাবে চাওক https://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html</li>\n </ul>"
+    },
+    {
+      "topic": "মই মোৰ পাছৱৰ্ডটো পাহৰি গ’লো",
+      "description": "<p>আপোনাৰ পাছৱৰ্ড পুনৰ ঠিক কৰিবলৈ, এই পদক্ষেপসমূহ অনুসৰণ কৰক আৰু আপোনাৰ একাউণ্টটো পুনৰ উদ্ধাৰ কৰক :\n</p>\n<ul>\n           <li>ইয়াত ক্লিক কৰক <strong>Forgot Password</strong></li>\n          <li>SUNBIRDত পঞ্জীয়ন কৰোঁতে আপুনি দিয়া ইমেইল ঠিকনা বা ম’বাইল নম্বৰ আৰু ব্যৱহাৰকাৰীৰ নাম প্ৰৱেশ কৰক</li>\n           <li><br></li>\n          <li>আপুনি আপোনাৰ পঞ্জীকৃত ইমেইল বা ম’বাইল নম্বৰত এটা অটিপি লাভ কৰিব</li>\n           <li><br></li>\n          <li>আপোনাৰ পাছৱৰ্ড পুনৰ ঠিক কৰিবলৈ অটিপি টো প্ৰৱেশ কৰক আৰু আপোনাৰ একাউণ্ট পুনৰ উদ্ধাৰ কৰক</li>\n         <li>আপোনাৰ পাছৱৰ্ড পুনৰ ঠিক কৰিবলৈ,  উল্লেখ কৰক <a href=\"https://staging.sunbirded.org/help/getting-started/recover-password/index.htmltarget=_blank\">পাছৱৰ্ড পুনৰ উদ্ধাৰ </a></li>\n</ul>"
+    },
+    {
+      "topic": "মই মোৰ প্ৰ’ফাইলৰ সবিশেষ সম্পাদনা কৰিব বিচাৰিছো",
+      "description": "আপুনি আপোনাৰ প্ৰ’ফাইলত নিম্নোক্ত সবিশেষ সম্পাদনা কৰিব পাৰিব:\n<ul>\n<li>নাম, ৰাজ্য, আৰু জিলাৰ দৰে ব্যক্তিগত সবিশেষ</li>\n<li>ম’বাইল নম্বৰ আৰু ইমেইল ঠিকনাৰ দৰে যোগাযোগৰ সবিশেষ</li>\n<li>ব’ৰ্ড, মাধ্যম, বিষয়, আৰু শ্ৰেণীৰ দৰে অন্যান্য সবিশেষ</li>\nপ্ৰ’ফাইলৰ সবিশেষ কেনেদৰে সম্পাদনা কৰে সেই বিষয়ে জানিবলৈ, চাওক\n<a href=\"https://staging.sunbirded.org/help/getting-started/user-profile/index.html\"target=\"_blank\">User profile</a>"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-bn.json b/utils/DesktopFAQ/faq-bn.json
index 9bf1afd2e..c17781ddf 100644
--- a/utils/DesktopFAQ/faq-bn.json
+++ b/utils/DesktopFAQ/faq-bn.json
@@ -2,27 +2,27 @@
   "faqs": [
     {
       "topic": "আমি আমার বোর্ড, মিডিয়াম বা মাধ্যম, ক্লাস ও বিষয় দেখতে পাচ্ছি না",
-      "description": "আপনার রাজ্য বর্তমানে সবধরনের বোর্ড, মিডিয়াম, ক্লাস ও বিষয়গুলি পড়ানোর সুযোগ প্রদান করছে না। যত তাড়াতাড়ি আপনার রাজ্য সেগুলি অন্তর্ভুক্ত করবে সেই অনুযায়ী আপনি সেগুলি তালিকায় দেখতে পাবেন।"
+      "description": "আপনার রাজ্য  বর্তমানে সবধরনের বোর্ড, মিডিয়াম, ক্লাস ও বিষয়গুলি পড়ানোর সুযোগ প্রদান করছে না। যত তাড়াতাড়ি আপনার রাজ্য সেগুলি অন্তর্ভুক্ত করবে সেই অনুযায়ী আপনি সেগুলি তালিকায় দেখতে পাবেন।"
     },
     {
       "topic": "আমি বিষয়বস্তুটি ডাউনলোড করেছি, কিন্তু আমি এটি চালু করতে পারছি না কারণ এখানে বলা হচ্ছে আমার ইন্টারনেট সংযোগ থাকা প্রয়োজন",
       "description": "আপনি YouTube-এর বিষয়বস্তু ডাউনলোড করে থাকতে পারেন। শুধুমাত্র অনলাইন থাকার সময় আপনি YouTube-এর বিষয়বস্তু চালাতে পারবেন। আপনার কম্পিউটারটি ইন্টারনেটের সাথে যুক্ত করে আবার চেষ্টা করুন।"
     },
     {
-      "topic": "আমার DIKSHA ডেস্কটপ অ্যাপটি আপডেট করা প্রয়োজন",
+      "topic": "আমার SUNBIRD ডেস্কটপ অ্যাপটি আপডেট করা প্রয়োজন",
       "description": "আপনার কম্পিউটারটি ইন্টারনেটের সঙ্গে যুক্ত করুন ও সাম্প্রতিকতম অ্যাপ সংস্করণটির জন্য https://staging.sunbirded.org/desktop/latest চেক করুন"
     },
     {
       "topic": "ইন্টারনেট সংযোগ সহ কোনও ল্যাপটপে আমার অ্যাকসেস নেই, কিন্তু আমার ডেস্কটপ অ্যাপে আমি বিষয়বস্তু যোগ করতে বা আপডেট করতে চাই",
-      "description": "যদি আপনার কোনো মোবাইল ফোন থাকে তবে DIKSHA মোবাইল অ্যাপটি google playstore থেকে ডাউনলোড করুন।\nঅ্যাপটির মধ্যে বিষয়বস্তুটি ব্রাউজ করুন।\nবিষয়বস্তুটি DIKSHA লাইব্রেরী থেকে ডাউনলোড করুন।\nএটিকে কোনও পেনড্রাইভ বা SD কার্ডে কপি করুন ও DIKSHA ডেস্কটপ অ্যাপে সেটি আপলোড করুন।"
+      "description": "যদি আপনার কোনো মোবাইল ফোন থাকে তবে SUNBIRD মোবাইল অ্যাপটি  google playstore থেকে ডাউনলোড করুন।\nঅ্যাপটির মধ্যে বিষয়বস্তুটি ব্রাউজ করুন।\nবিষয়বস্তুটি SUNBIRD লাইব্রেরী থেকে ডাউনলোড করুন।\nএটিকে কোনও পেনড্রাইভ বা SD কার্ডে কপি করুন ও SUNBIRD ডেস্কটপ অ্যাপে সেটি আপলোড করুন।"
     },
     {
       "topic": "আমি একটি নির্দিষ্ট প্রসঙ্গের ওপর বিষয়বস্তু খুঁজে পাচ্ছি না, অথবা আমি দেখছি বিষয়বস্তুটি অপ্রাসঙ্গিক",
-      "description": "নির্দিষ্ট বিষয়বস্তু খুঁজে পেতে DIKSHA-এর অনলাইন লাইব্রেরীতে ব্রাউজ করুন। যদি তারপরেও আপনি খুঁজে না পান তবে বিষয়বস্তু সম্পর্কে আপনার ফিডব্যাক বা প্রতিক্রিয়া রাজ্য SCERT-এর কাছে পাঠান"
+      "description": "নির্দিষ্ট বিষয়বস্তু খুঁজে পেতে SUNBIRD-এর অনলাইন লাইব্রেরীতে ব্রাউজ করুন। যদি তারপরেও আপনি খুঁজে না পান তবে বিষয়বস্তু সম্পর্কে আপনার ফিডব্যাক বা প্রতিক্রিয়া রাজ্য SCERT-এর কাছে পাঠান"
     },
     {
       "topic": "এই অ্যাপটি খুবই ধীরে কাজ করে",
-      "description": "অ্যাপটির কার্যক্ষমতার গতি বৃদ্ধি করতে, নিম্নলিখিত পদ্ধতিটি অনুসরণ করুন:\n<br>আপনার কম্পিউটারের সিস্টেম কনফিগারেশনে যান। নূন্যতম কনফিগারেশন হওয়া প্রয়োজন:\n<ul><li>2 GB RAM</li>\n<li>ডুয়েল কোর প্রসেসর</li></ul>\n<br>যদি আপনার কম্পিউটারে এই বা এর থেকে উন্নত কনফিগারেশন থাকে তবে অ্যাপটি রিস্টার্ট করুন।\n<br>এটি করার পরেও, যদি অ্যাপটি ধীরে কাজ করে তবে <b>টাস্ক ম্যানেজারে</b> যান, সব অব্যবহৃত ব্যাকগ্রাউন্ড প্রসেসগুলি নির্বাচন করুন ও <b>এন্ড টাস্কে</b> ক্লিক করুন"
+      "description": "অ্যাপটির কার্যক্ষমতার গতি বৃদ্ধি করতে, নিম্নলিখিত পদ্ধতিটি অনুসরণ করুন:\n<br>আপনার কম্পিউটারের সিস্টেম কনফিগারেশনে যান। নূন্যতম কনফিগারেশন  হওয়া প্রয়োজন:\n<ul><li>2 GB RAM</li>\n<li>ডুয়েল কোর প্রসেসর</li></ul>\n<br>যদি আপনার কম্পিউটারে এই বা এর থেকে উন্নত কনফিগারেশন থাকে তবে অ্যাপটি রিস্টার্ট করুন।\n<br>এটি করার পরেও, যদি অ্যাপটি ধীরে কাজ করে তবে <b>টাস্ক ম্যানেজারে</b> যান, সব অব্যবহৃত ব্যাকগ্রাউন্ড প্রসেসগুলি নির্বাচন করুন ও  <b>এন্ড টাস্কে</b> ক্লিক করুন"
     },
     {
       "topic": "আমি একটি পেনড্রাইভে বিষয়বস্তু কপি করতে পারছি না",
@@ -37,12 +37,24 @@
       "description": "ফাইলটির আকারের ওপর নির্ভর করে যে ফাইলটি কপি হতে কত সময় লাগবে। বড় টেক্সটবুকগুলি কপি হতে বেশি সময় লাগে। আমরা সুপারিশ করব প্রক্রিয়াটি চলাকালীন মাঝপথে সেটি বন্ধ করবেন না। সেটি করলে কপি হওয়া ফাইলটিতে ত্রুটি থেকে যেতে পারে।"
     },
     {
-      "topic": "DIKSHA-এর বিষয়বস্তু রাখার কারণে আমার কম্পিউটারে খালি জায়গা নেই।",
+      "topic": "SUNBIRD-এর বিষয়বস্তু রাখার কারণে আমার কম্পিউটারে খালি জায়গা নেই।",
       "description": "ডাউনলোড করা বিষয়বস্তু অ্যাপটির মাই ডাউনলোড ট্যাব থেকে ডিলিট করে আপনার কম্পিউটারে জায়গা খালি করুন।"
     },
     {
-      "topic": "আমার উবানটু সিস্টেমে DIKSHA ডেস্কটপ অ্যাপটি ইনস্টল করা যাচ্ছে না",
-      "description": "<p>আপনার উবান্টু সিস্টেমে DIKSHA ডেস্কটপ অ্যাপ্লিকেশন ইনস্টল করতে:</p>\n<p>1) আপনার টার্মিনালটি খুলুন</p>\n<p>2) যেখানে এক্সটেনসন ফাইলটি ডাউনলোড করা হয়েছে সেখানে ডিরেক্টরিটি পরিবর্তন করতে কম্যান্ডটি cd <location> টাইপ করে চালু করুন। উদাহরণস্বরূপ, যদি এক্সটেনসন ফাইলটি ডাউনলোড ফোল্ডারে সংরক্ষণ করা থাকে, তবে কম্যান্ডটি cd Download টাইপ করে চালু করুন</p>\n<p>3) sudo dpkg -i <filename> টাইপ করে কম্যান্ডটি চালু করুন</p>\n<p>এই কম্যান্ডটি সফলভাবে চালু হওয়াতে অ্যাপ্লিকেশনটি চালু হয়েছে </p>"
+      "topic": "আমার উবানটু সিস্টেমে SUNBIRD ডেস্কটপ অ্যাপটি ইনস্টল করা যাচ্ছে না",
+      "description": "<p>আপনার উবান্টু সিস্টেমে SUNBIRD ডেস্কটপ অ্যাপ্লিকেশন ইনস্টল করতে:</p>\n<p>1) আপনার টার্মিনালটি খুলুন</p>\n<p>2) যেখানে এক্সটেনসন ফাইলটি ডাউনলোড করা হয়েছে সেখানে ডিরেক্টরিটি পরিবর্তন করতে কম্যান্ডটি cd <location>  টাইপ করে চালু করুন। উদাহরণস্বরূপ, যদি এক্সটেনসন ফাইলটি ডাউনলোড ফোল্ডারে সংরক্ষণ করা থাকে, তবে কম্যান্ডটি cd Download টাইপ করে চালু করুন</p>\n<p>3) sudo dpkg -i <filename> টাইপ করে কম্যান্ডটি চালু করুন</p>\n<p>এই কম্যান্ডটি সফলভাবে চালু হওয়াতে অ্যাপ্লিকেশনটি চালু হয়েছে </p>"
+    },
+    {
+      "topic": "আমি SUNBIRD-তে রেজিস্ট্রী করতে চাই",
+      "description": "SUNBIRD-তে সাইন আপ করার জন্য:\n<ul>\n<li><a href =\"https://staging.sunbirded.org/explore\"target=\"_blank\">SUNBIRD সম্পর্কে জানুন-এ </a>যান\n<li>আপনি একজন শিক্ষক না শিক্ষার্থী সেটি নির্বাচন করুন</li>\n<li>আপনার অবস্থান সম্পর্কিত বিবরণ আপডেট করুন</li>\n<li>প্রোফাইল আইকনে ক্লিক করুন</li>\n<li><b>লগইনে</b> ক্লিক করুন</li>\n<li>লগইন স্ক্রীনে থাকা </b>এখানে রেজিস্ট্রী করুন-এ</b> ক্লিক করুন</li>\n<li>কিভাবে রেজিস্ট্রী করবেন সে বিষয়ে বিস্তারিত জানতে https://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html দেখুন</li>\n</ul>"
+    },
+    {
+      "topic": "আমি আমার পাসওয়ার্ড ভুলে গেছি",
+      "description": "<p>আপনার পাসওয়ার্ড পুনরায় সেট করতে, এই পদক্ষেপগুলি অনুসরণ করুন এবং আপনার অ্যাকাউন্টটি পুনরুদ্ধার করুন:</p><ul>\nপাসওয়ার্ড ভুলে গেছি-তে</strong></li> <li>ক্লিক করুন <strong>\n<li>SUNBIRD-তে <li> রেজিস্ট্রী করার সময় আপনি যে ইমেল অ্যাড্রেস বা মোবাইল নম্বর এবং ব্যবহারকারীর নাম দিয়েছিলেন তা এন্টার করুন\n<li><br></li>\n<li>আপনি আপনার রেজিস্ট্রী করা ইমেল বা মোবাইল নম্বরে একটি ওটিপি পাবেন<li>\n<li><br></li>\n<li> আপনার পাসওয়ার্ডটি পুনরায় সেট করতে এবং আপনার অ্যাকাউন্টটি পুনরুদ্ধার করতে ওটিপি এন্টার করুন </li>\n<li> আপনার পাসওয়ার্ডটি পুনরায় সেট করতে,\n<a href=\"https://staging.sunbirded.org/help/getting-started/recover-password/index.htmltarget=_blank\">পাসওয়ার্ড পুনরুদ্ধার করুন</a></li></ul>দেখুন"
+    },
+    {
+      "topic": "আমি আমার প্রোফাইল সম্পর্কিত বিবরণ সম্পাদনা করতে চাই",
+      "description": "আপনি আপনার প্রোফাইলে নিম্নলিখিত বিবরণগুলি সম্পাদনা করতে পারেন:<ul>\n<li>ব্যক্তিগত বিবরণ যেমন নাম, রাজ্য এবং জেলা </li>\n<li>যোগাযোগের বিবরণ যেমন মোবাইল নম্বর এবং ইমেল অ্যাড্রেস</li>\n<li>অন্যান্য বিবরণ যেমন বোর্ড,মাধ্যমের ভাষা , বিষয় এবং ক্লাস</li>\nপ্রোফাইলের বিবরণ কীভাবে সম্পাদনা করবেন সে সম্পর্কে বিস্তারিত জানতে, দেখুন\n<a href=\"https://staging.sunbirded.org/help/getting-started/user-profile/index.html\"target=\"_blank\">ব্যবহারকারীর প্রোফাইল</a>"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-en.json b/utils/DesktopFAQ/faq-en.json
index 413c849e6..91b36b942 100644
--- a/utils/DesktopFAQ/faq-en.json
+++ b/utils/DesktopFAQ/faq-en.json
@@ -9,16 +9,16 @@
       "description": "You may have downloaded YouTube content. You can play YouTube content only when you are online. Connect the computer to the Internet try again. "
     },
     {
-      "topic": "I need to update my DIKSHA desktop app",
+      "topic": "I need to update my SUNBIRD desktop app",
       "description": "Connect your computer to the Internet and check https://staging.sunbirded.org/desktop/latest for the latest app version "
     },
     {
       "topic": "I do not have access to a laptop with an Internet connection, but I want to add or update content on the desktop app",
-      "description": "If you have a mobile phone, download the DIKSHA mobile app from the google playstore. \nBrowse for the content in the app. \nDownload the content from the DIKSHA library. \nCopy it on a pendrive or SD card and upload it to the DIKSHA desktop app."
+      "description": "If you have a mobile phone, download the SUNBIRD mobile app from the google playstore. \nBrowse for the content in the app. \nDownload the content from the SUNBIRD library. \nCopy it on a pendrive or SD card and upload it to the SUNBIRD desktop app."
     },
     {
       "topic": "I do not find content for a particular topic, or I find the content irrelevant",
-      "description": "Browse DIKSHA's online library to search for the content. If it is still unavailable, send your feedback about content to the State SCERT"
+      "description": "Browse SUNBIRD's online library to search for the content. If it is still unavailable, send your feedback about content to the State SCERT"
     },
     {
       "topic": "The app is very slow",
@@ -37,12 +37,28 @@
       "description": "The time taken to copy depends on the size of the content file. Some large textbooks take time to copy. We recommend that you do not stop the process in between. Doing so may lead to inconsistent files."
     },
     {
-      "topic": "My computer does not have any free space because of DIKSHA content",
+      "topic": "My computer does not have any free space because of SUNBIRD content",
       "description": "Delete downloaded content from the My Downloads tab of the app to free up space on your computer"
     },
     {
-      "topic": "Unable to install DIKSHA Desktop application on my Ubuntu system",
-      "description": "<p>To install DIKSHA Desktop application on your ubuntu system:</p>\n<p>1) Open your terminal</p>\n<p>2) Run the command cd <location> to change the directory to where the exe file is downloaded. For example, if the exe is saved in the downloads folder, then run the command cd Downloads</p>\n<p>3) Run the command sudo dpkg -i <filename></p>\n<p>On successfully running this command the application is launched </p>"
+      "topic": "Unable to install SUNBIRD Desktop application on my Ubuntu system",
+      "description": "<p>To install SUNBIRD Desktop application on your ubuntu system:</p>\n<p>1) Open your terminal</p>\n<p>2) Run the command cd <location> to change the directory to where the exe file is downloaded. For example, if the exe is saved in the downloads folder, then run the command cd Downloads</p>\n<p>3) Run the command sudo dpkg -i <filename></p>\n<p>On successfully running this command the application is launched </p>"
+    },
+    {
+      "topic": "I want to register on SUNBIRD",
+      "description": "To register on SUNBIRD:\n<ul>\n  <li>Go to <a href =\"https://staging.sunbirded.org/explore\"target=\"_blank\">Explore SUNBIRD </a> </li>\n<li>Select whether you are a teacher or a student</li>\n<li>Update your location details</li>\n<li>Click on the profile icon</li>\n<li>Click <b>Login</b></li>\n<li>Click <b>Register here</b> on the login screen</li>\n<li>For details on how to register refer https://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html</li>\n</ul>"
+    },
+    {
+      "topic": "I forgot my password",
+      "description": "<p>To reset your password, follow these steps and recover your account:</p>\n<ul>\n    <li>Click <strong>Forgot Password</strong></li>\n    <li>Enter the email address or mobile number and user name that you provided while registering on SUNBIRD</li>\n    <li><br></li>\n    <li>You will receive an OTP on your registered email or mobile number</li>\n    <li><br></li>\n    <li>Enter the OTP to reset your password and recover your account</li>\n    <li>For details to reset your password, refer <a href=\"https://staging.sunbirded.org/help/getting-started/recover-password/index.htmltarget=_blank\">Recover password</a></li>\n</ul>"
+    },
+    {
+      "topic": "I want to login on SUNBIRD through my State portal",
+      "description": "<p>To login to SUNBIRD through your State portal:</p>\n<ul>\n    <li>Go to <a href=\"https://staging.sunbirded.org/explore\">Explore SUNBIRD</a>&nbsp;</li>\n    <li>Select that you are a <strong>Teacher</strong></li>\n    <li>Select your location&nbsp;</li>\n    <li>Click the <strong>Profile</strong> icon</li>\n    <li>Click <strong>Login</strong></li>\n    <li>Select <strong>Login with State system</strong></li>\n    <li>Select your State</li>\n    <li>You will be redirected to your State portal</li>\n    <li>Enter the <strong>User name</strong> and <strong>Password</strong> as given to you by your State in the <strong>Login&nbsp;</strong>screen&nbsp;</li>\n    <li>Click <strong>Submit</strong></li>\n    <li>For details to log in through the State portal, refer&nbsp;<a href=\"https://staging.sunbirded.org/help/getting-started/login/#logging-in-with-state-system\">Sign Up</a></li>\n</ul>"
+    },
+    {
+      "topic": "I want to edit my profile details",
+      "description": "You can edit the following details in your Profile:\n<ul>\n<li>Personal details such as name, State, and district</li>\n<li>Contact details such as a mobile number and email address</li>\n<li>Other details such as board, medium, subject, and class</li>\nFor details on how to edit profile details, refer \n<a href=\"https://staging.sunbirded.org/help/getting-started/user-profile/index.html\"target=\"_blank\">User profile</a>\n\n"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-gu.json b/utils/DesktopFAQ/faq-gu.json
index 9410f95a4..744e1887a 100644
--- a/utils/DesktopFAQ/faq-gu.json
+++ b/utils/DesktopFAQ/faq-gu.json
@@ -5,20 +5,20 @@
       "description": "તમારું રાજ્ય હાલમાં બધા બોર્ડ, માધ્યમો, વર્ગો અને વિષયોને સપોર્ટ કરતું નથી. જલદી તમારું રાજ્ય તેમને ઉમેરશે, તમે તેને સૂચિમાં જોશો"
     },
     {
-      "topic": "મેં કન્ટેન્ટ ડાઉનલોડ કરું છે, પરંતુ હું તે ચલાવવામાં અસમર્થ છું કારણ કે તે કહે છે કે મને ઇન્ટરનેટની જરૂર છે",
+      "topic": "મેં કન્ટેન્ટ ડાઉનલોડ  કરું છે, પરંતુ હું તે ચલાવવામાં અસમર્થ છું કારણ કે તે કહે છે કે મને ઇન્ટરનેટની જરૂર છે",
       "description": "તમે યુટ્યુબ કન્ટેન્ટ ડાઉનલોડ કરી હશે. તમે ઓનલાઇન હોવ ત્યારે જ તમે યુટ્યુબ સામગ્રી ચલાવી શકો છો. કમ્પ્યુટરને ઇન્ટરનેટથી કનેક્ટ કરો ફરીથી પ્રયાસ કરો."
     },
     {
-      "topic": "મારે મારી DIKSHA ડેસ્કટોપ એપ્લિકેશનને અપડેટ કરવાની જરૂર છે",
+      "topic": "મારે મારી SUNBIRD ડેસ્કટોપ એપ્લિકેશનને અપડેટ કરવાની જરૂર છે",
       "description": "તમારા કમ્પ્યુટરને ઇન્ટરનેટથી કનેક્ટ કરો અને નવીનતમ એપ્લિકેશન સંસ્કરણ માટે https://staging.sunbirded.org/desktop/latest તપાસો.\n"
     },
     {
       "topic": "મને ઇન્ટરનેટ કનેક્શનવાળા લેપટોપની ઍક્સેસ નથી, પરંતુ હું ડેસ્કટોપ એપ્લિકેશન પર સામગ્રી ઉમેરવા અથવા અપડેટ કરવા માંગું છું",
-      "description": "જો તમારી પાસે મોબાઈલ ફોન છે, તો ગૂગલ પ્લે સ્ટોર પરથી DIKSHA મોબાઇલ એપ્લિકેશન ડાઉનલોડ કરો. એપ્લિકેશનમાંની સામગ્રી માટે બ્રાઉઝ કરો. DIKSHA લાઇબ્રેરીમાંથી સામગ્રી ડાઉનલોડ કરો. તેને પેનડ્રાઇવ અથવા એસડી કાર્ડ પર કોપી કરો અને તેને DIKSHA ડેસ્કટોપ એપ્લિકેશન પર અપલોડ કરો."
+      "description": "જો તમારી પાસે મોબાઈલ ફોન છે, તો ગૂગલ પ્લે સ્ટોર પરથી SUNBIRD મોબાઇલ એપ્લિકેશન ડાઉનલોડ કરો. એપ્લિકેશનમાંની સામગ્રી માટે બ્રાઉઝ કરો. SUNBIRD લાઇબ્રેરીમાંથી સામગ્રી ડાઉનલોડ કરો. તેને પેનડ્રાઇવ અથવા એસડી કાર્ડ પર કોપી કરો અને તેને SUNBIRD ડેસ્કટોપ એપ્લિકેશન પર અપલોડ કરો."
     },
     {
       "topic": "મને કોઈ ખાસ વિષય માટે સામગ્રી મળી નથી, અથવા મને સામગ્રી અપ્રસ્તુત લાગે છે\n",
-      "description": "કન્ટેન્ટ શોધવા માટે DIKSHAની ઓનલાઇન લાઇબ્રેરી બ્રાઉઝ કરો. જો તે હજી અનુપલબ્ધ છે, તો કન્ટેન્ટ વિશેનો પ્રતિસાદ રાજ્ય SCERTને મોકલો"
+      "description": "કન્ટેન્ટ શોધવા માટે SUNBIRDની ઓનલાઇન લાઇબ્રેરી બ્રાઉઝ કરો. જો તે હજી અનુપલબ્ધ છે, તો કન્ટેન્ટ વિશેનો પ્રતિસાદ રાજ્ય SCERTને મોકલો"
     },
     {
       "topic": "એપ્લિકેશન ખૂબ ધીમી છે",
@@ -26,7 +26,7 @@
     },
     {
       "topic": "હું પેનડ્રાઇવ પર કન્ટેન્ટની કોપી કરવામાં અસમર્થ છું",
-      "description": "પેન ડ્રાઇવ પરની સામગ્રીની કોપી કરવા માટે, નીચેની વિગતો કરો: \n<ul>\n <li> તમારા કમ્પ્યુટર સેટિંગ્સ પર જાઓ. યુએસબી ડ્રાઇવ લખવા સુરક્ષિત છે કે કેમ તે તપાસો. જો તે છે, તો સુરક્ષાને બંધ કરો </li> \n<li> પેન ડ્રાઇવમાં ખાલી જગ્યા છે કે કેમ તે તપાસો. પેનડ્રાઈવેમાં જે ફાઇલો જરૂરી નથી તેને કાઢી નાખો </li> \n</ul>"
+      "description": "પેન ડ્રાઇવ પરની સામગ્રીની કોપી કરવા માટે, નીચેની વિગતો  કરો: \n<ul>\n <li> તમારા કમ્પ્યુટર સેટિંગ્સ પર જાઓ. યુએસબી ડ્રાઇવ લખવા સુરક્ષિત છે કે કેમ તે તપાસો. જો તે છે, તો સુરક્ષાને  બંધ કરો </li> \n<li> પેન ડ્રાઇવમાં  ખાલી જગ્યા છે કે કેમ તે તપાસો. પેનડ્રાઈવેમાં જે ફાઇલો જરૂરી નથી તેને કાઢી  નાખો </li> \n</ul>"
     },
     {
       "topic": "મારી પેનડ્રાઈવ પર મેં કન્ટેન્ટ લોડ કરી હતી, પરંતુ હવે હું જોઉં છું કે તે ખાલી છે",
@@ -37,12 +37,28 @@
       "description": "કોપી કરવા માટે લેવાયેલ સમય સામગ્રી ફાઇલના કદ પર આધારિત છે. કેટલાક મોટા પાઠયપુસ્તકોની કોપી કરવામાં સમય લે છે. અમે ભલામણ કરીએ છીએ કે તમે પ્રક્રિયા વચ્ચે ન રોકો. આમ કરવાથી અસંગત ફાઇલો થઈ શકે છે."
     },
     {
-      "topic": "DIKSHA સામગ્રીને કારણે મારા કમ્પ્યુટર પાસે કોઈ ખાલી જગ્યા નથી",
+      "topic": "SUNBIRD સામગ્રીને કારણે મારા કમ્પ્યુટર પાસે કોઈ ખાલી જગ્યા નથી",
       "description": "તમારા કમ્પ્યુટર પર જગ્યા ખાલી કરવા માટે એપ્લિકેશનના મારા ડાઉનલોડ ટેબ પરથી ડાઉનલોડ કરેલી સામગ્રી ડીલીટ નાખો"
     },
     {
-      "topic": "મારી ઉબુન્ટુ સિસ્ટમ પર DIKSHA ડેસ્કટોપ એપ્લિકેશન ઇન્સ્ટોલ કરવામાં અસમર્થ",
-      "description": "<p> તમારી ઉબુન્ટુ સિસ્ટમ પર DIKSHA ડેસ્કટોપ એપ્લિકેશનને ઇન્સ્ટોલ કરવા માટે: </p> \n<p> 1) તમારું ટર્મિનલ ખોલો </p>\n <p> 2) ડિરેક્ટરીને બદલવા માટે cd <location> આદેશ ચલાવો જ્યાં એક્સેપ્ ફાઇલ ડાઉનલોડ થયેલ છે. ઉદાહરણ તરીકે, જો એક્સેલ ડાઉનલોડ્સ ફોલ્ડરમાં સાચવવામાં આવે છે, તો પછી સીડી ડાઉનલોડ્સ આદેશ ચલાવો </p> \n<p> 3) sudo dpkg -i <filename></p> \n<p> આ આદેશ સફળતાપૂર્વક ચલાવવા પર એપ્લિકેશન શરૂ થઈ છે </p>"
+      "topic": "મારી ઉબુન્ટુ સિસ્ટમ પર SUNBIRD ડેસ્કટોપ એપ્લિકેશન ઇન્સ્ટોલ કરવામાં અસમર્થ",
+      "description": "<p> તમારી ઉબુન્ટુ સિસ્ટમ પર SUNBIRD ડેસ્કટોપ એપ્લિકેશનને ઇન્સ્ટોલ કરવા માટે: </p> \n<p> 1) તમારું ટર્મિનલ ખોલો </p>\n <p> 2) ડિરેક્ટરીને બદલવા માટે cd <location> આદેશ ચલાવો જ્યાં એક્સેપ્ ફાઇલ ડાઉનલોડ થયેલ છે. ઉદાહરણ તરીકે, જો એક્સેલ ડાઉનલોડ્સ ફોલ્ડરમાં સાચવવામાં આવે છે, તો પછી સીડી ડાઉનલોડ્સ આદેશ ચલાવો </p> \n<p> 3) sudo dpkg -i <filename></p> \n<p> આ આદેશ સફળતાપૂર્વક ચલાવવા પર એપ્લિકેશન શરૂ થઈ છે </p>"
+    },
+    {
+      "topic": "હું SUNBIRD પર નોંધણી કરવા માંગું છું",
+      "description": "SUNBIRD પર સાઇન અપ કરવા માટે:\n <ul> \n<li> https://staging.sunbirded.org/explore  પર જાઓ</li> \n<li> તમે શિક્ષક છો કે વિદ્યાર્થી, તે પસંદ કરો </li> \n<li> તમારું સ્થાન વિગતો અપડેટ કરો </li> \n<li> પ્રોફાઇલ આયકન પર ક્લિક કરો </li> \n<li> લોગ ઇન ક્લિક કરો </li> \n<li> લોગ ઇન સ્ક્રીન પર સાઇન અપ પર ક્લિક કરો </li>\n <li> સાઇન અપ કેવી રીતે કરવું તે વિશે વધુ વિગતો માટે સંદર્ભ લો https://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html </li>\n </ul>"
+    },
+    {
+      "topic": "હું મારો પાસવાર્ડ ભૂલી ગયો છું",
+      "description": "<p>તમારા પાસવર્ડને પુનઃસુયોજિત કરવા માટે, આ પગલાંઓને અનુસરો અને તમારું ખાતું પુનઃપ્રાપ્ત કરો:</p>\n<ul>\n<li>ક્લિક <strong>ભૂલીગયેલ પાસવર્ડ</strong></li>\n<li>SUNBIRD પર નોંધણી કરતી વખતે તમે આપેલ ઇમેઇલ સરનામું અથવા મોબાઇલ નંબર અને વપરાશકર્તા નામ દાખલ કરો</li>\n<li>તમે આપેલ ઇમેઇલ એડ્રેસ અથવા મોબાઇલ નંબર અને વપરાશકર્તાનું નામ દાખલ કરો</li>\n<li><br></li>\n<li> તમે તમારા રજિસ્ટર્ડ ઇમેઇલ અથવા મોબાઇલ નંબર પર ઓટીપી મેળવી શકશો</li>\n<li><br></li>\n<li>તમારા પાસવર્ડને પુનઃસુયોજિત કરવા માટે વિગતો માટે,\n <a href=\"https://staging.sunbirded.org/help/geting-start/recover-password/index.htmltarget=_blank\">\nપાસવર્ડ પાછો મેળવો</a>\n</li>\n</ul>"
+    },
+    {
+      "topic": "હું મારા રાજ્ય પોર્ટલ દ્વારા SUNBIRD પર લોગ ઈન કરવા માંગુ છું",
+      "description": "<p>તમારા સ્ટેટ પોર્ટલ મારફતે SUNBIRDમાં પ્રવેશ કરવા માટે </p>\n<ul>\n<li>એમાં જાઓ <a href=\"https://staging.sunbirded.org/explore\">Search SUNBIRD</a>&nbsp;</li>\n<li>તમે <strong>શિક્ષક</strong> છો તે પસંદ કરો</li>\n<li><strong>પ્રોફાઇલ</strong>પર ક્લિક કરો</li>\n<li><strong>લોગ ઈન </strong>પર ક્લિક કરો</li>\n<li> સ્ટેટ  સિલેક્ટ કરો</li>\n<li>તમને તમારા રાજ્ય પોર્ટલપર પુનઃનિર્દેશિત કરવામાં આવશે</li>\n<li><strong>લોગ ઈન</strong> સ્ક્રીન પર જે તમારા સ્ટેટ દ્વારા <strong>યુઝરનામ </strong>અને <strong>પાસવર્ડ</strong> આપેલ છે ત દાખલ કરો </li>\n<li> <strong>સબમિટ </strong> ક્લિક કરો</li>\n<li>સ્ટેટ પોર્ટલ મારફતે લોગ ઇન કરવા માટે વિગતો માટે, સંદર્ભ&nbsp;\n<a href=\"https://staging.sunbirded.org/help/geting-started/login/#logging-in-with-state-system\">Sign Up</a>\n</li>\n</ul>"
+    },
+    {
+      "topic": "હું મારી પ્રોફાઇલ વિગતોને સંપાદિત કરવા માંગુ છું",
+      "description": "તમે તમારી પ્રોફાઇલમાં નીચેની વિગતો સંપાદિત કરી શકો છો:\n <ul> \n<li> નામ, રાજ્ય અને જિલ્લા જેવી વ્યક્તિગત વિગતો </li>\n <li> સંપર્ક નંબર જેમ કે મોબાઇલ નંબર અને ઇમેઇલ સરનામું </li>\n <li> બોર્ડ, માધ્યમ, વિષય અને વર્ગ જેવી અન્ય વિગતો </li> \nપ્રોફાઇલ વિગતોને કેવી રીતે સંપાદિત કરવી તે વિશે વધુ વિગતો માટે, \n<a href = https://staging.sunbirded.org/help/getting-started/SUNBIRD-mobile-app/profile.html\"target=\"_blank\"> સાઇન અપ કરો </a>"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-hi.json b/utils/DesktopFAQ/faq-hi.json
index 9736c8cfc..921395006 100644
--- a/utils/DesktopFAQ/faq-hi.json
+++ b/utils/DesktopFAQ/faq-hi.json
@@ -37,12 +37,28 @@
       "description": "कॉपी करने के लिए लिया गया समय कंटेन्ट फ़ाइल के आकार पर निर्भर करता है। कुछ बड़ी पाठ्यपुस्तकों को कॉपी करने में समय लगता है। हमारा सुझाव है कि आप इस प्रक्रिया को बीच में न रोकें। ऐसा करने से असंगत फ़ाइलें बन सकती हैं।"
     },
     {
-      "topic": "DIKSHA कंटेन्ट के कारण मेरे कंप्यूटर में खाली जगह नहीं है",
+      "topic": "SUNBIRD कंटेन्ट के कारण मेरे कंप्यूटर में खाली जगह नहीं है",
       "description": "अपने कंप्यूटर पर जगह खाली करने के लिए ऐप के माई डाउनलोड टैब से डाउनलोड की गई कंटेन्ट को हटाएं"
     },
     {
       "topic": "मेरे Ubuntu सिस्टम पर दीक्षा डेस्कटॉप एप्लिकेशन इंस्टॉल करने में असमर्थ",
-      "description": "<p> अपने ubuntu सिस्टम पर DIKSHA डेस्कटॉप एप्लिकेशन इंस्टॉल करने के लिए: </ p>\n<p> 1) अपना टर्मिनल खोलें </p>\n<p> 2) निर्देशिका को बदलने के लिए कमांड सीडी <स्थान> को चलाएँ जहाँ एक्स फ़ाइल है डाउनलोड किया गया है। उदाहरण के लिए, यदि exe डाउनलोड फ़ोल्डर में सहेजा गया है, तो कमांड cd डाउनलोड चलाएं </p>\n<p> 3) कमांड sudo dpkg -i चलाएं <filename> </p>\n<p> सफलतापूर्वक इस कमांड को चलाने पर एप्लिकेशन लॉन्च किया गया है </p>"
+      "description": "<p> अपने ubuntu सिस्टम पर SUNBIRD डेस्कटॉप एप्लिकेशन इंस्टॉल करने के लिए: </ p>\n<p> 1) अपना टर्मिनल खोलें </p>\n<p> 2) निर्देशिका को बदलने के लिए कमांड सीडी <स्थान> को चलाएँ जहाँ एक्स फ़ाइल है डाउनलोड किया गया है। उदाहरण के लिए, यदि exe डाउनलोड फ़ोल्डर में सहेजा गया है, तो कमांड cd डाउनलोड चलाएं </p>\n<p> 3) कमांड sudo dpkg -i चलाएं <filename> </p>\n<p> सफलतापूर्वक इस कमांड को चलाने पर एप्लिकेशन लॉन्च किया गया है </p>"
+    },
+    {
+      "topic": "मैं दीक्षा पर पंजीकरण करना चाहता/चाहती हूँ",
+      "description": "SUNBIRD पर साइन अप करने के लिए:\n<ul>\n<li> <a href=\"https://staging.sunbirded.org/explore\" target=\"_blank\">SUNBIRD का अनवेक्षण</a>करें</li>\n<li>चुनें कि आप एक शिक्षक या एक छात्र हैं</li>\n<li>अपने स्थान विवरण अपडेट करें</li>\n<li>प्रोफाइल आइकन <li>Update your location details</li>पर क्लिक करें</li>\n<li><b>लॉगिन</b> पर क्लिक करें</li>\n<li>लॉगिन स्क्रीन पर <b>यहां पंजीकृत करें</b>पर क्लिक करें</li>\n<li>पंजीकरण की जानकारी के लिए https://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html देखें</li>\n</ul>"
+    },
+    {
+      "topic": "मुझे अपना पासवर्ड याद नहीं",
+      "description": "<p>अपना पासवर्ड रीसेट करने के लिए, इन चरणों का पालन करें और अपने खाते को बहाल करें:</p>\n<ul>\n<li> <strong>पासवर्ड भूल गयें </strong>क्लिक कीजिए</li>\n<li>SUNBIRD पर पंजीकरण करते समय आपके द्वारा दिए गए ईमेल पता या मोबाइल नंबर और उपयोगकर्ता नाम दर्ज करें</li>\n<li><br></li>\n<li>आपको अपने पंजीकृत ईमेल या मोबाइल नंबर पर एक OTP प्राप्त होगा</li>\n<li><br></li>\n<li>पासवर्ड रीसेट करने और अपना खाता बहाल करने के लिए OTP डालें</li>\n<li>अधिक जानकारी के लिए, <a href=\"https://staging.sunbirded.org/help/getting-started/recover-password/index.htmltarget=_blank\">पासवर्ड बहाल करें</a> लिंक देखें</li>\n</ul>"
+    },
+    {
+      "topic": "मैं अपने राज्य पोर्टल के माध्यम से दीक्षा पर लॉगिन करना चाहता/चाहती हूँ",
+      "description": "<p>अपने राज्य पोर्टल के माध्यम से SUNBIRD में लॉगिन करने के लिए:</p>\n<ul>\n<li><a href=\"https://staging.sunbirded.org/explore\">SUNBIRD का अन्वेषण करें </a> पर जाएँ</li>\n<li>चुनें कि आप एक <strong>शिक्षक</strong>हैं</li>\n<li>अपना स्थान चुनें &nbsp</li>\n<li><strong>प्रोफाइल</strong>आइकन पर क्लिक करें</li>\n<li><strong>लॉगिन</strong> पर क्लिक करें</li>\n<li><strong>राज्य प्रणाली के साथ लॉगिन</strong>का चयन करें</li>\n<li>अपने राज्य का चयन करें</li>\n<li>आपको अपने राज्य पोर्टल पर पुनः निर्दिष्ट किया जाएगा</li>\n<li><strong>लॉगिन&nbsp;</strong>स्क्रीन&nbsp;में अपने राज्य द्वारा आपको दिए गए <strong>उपयोगकर्ता नाम</strong> और <strong>पासवर्ड</strong> को दर्ज करें</li>\n<li><strong>सबमिट पर</strong> क्लिक करें</li>\n<li>राज्य पोर्टल के माध्यम से लॉग इन करने के लिए विवरण के लिए &nbsp;,<a href=\"https://staging.sunbirded.org/help/getting-started/login/#logging-in-with-state-system\">साइन अप</a> देखें</li>\n</ul>"
+    },
+    {
+      "topic": "मैं अपने प्रोफ़ाइल विवरण को संपादित करना चाहता/चाहती हूं",
+      "description": "आप अपनी प्रोफ़ाइल में निम्नलिखित विवरण संपादित कर सकते हैं:\n<ul>\n<li>नाम, राज्य और जिला जैसे व्यक्तिगत विवरण</li>\n<li>मोबाइल नंबर और ईमेल पते जैसे संपर्क विवरण</li>\n<li>बोर्ड, माध्यम, विषय और कक्षा जैसे अन्य विवरण</li>\nप्रोफ़ाइल विवरणों को संपादित करने के तरीके के बारे में जानकारी के लिए, \n<a href=\"https://staging.sunbirded.org/help/getting-started/user-profile/index.html\" target=\"_blank\"देखें>यूजर प्रोफाइल</a>\n</ul>"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-kn.json b/utils/DesktopFAQ/faq-kn.json
index 1be7171ac..c709f28bc 100644
--- a/utils/DesktopFAQ/faq-kn.json
+++ b/utils/DesktopFAQ/faq-kn.json
@@ -1,12 +1,12 @@
 {
   "faqs": [
     {
-      "topic": "ನನ್ನ ಮಂಡಳಿ, ಮಾಧ್ಯಮ, ತರಗತಿ ಮತ್ತು ವಿಷಯ ಕಾಣುತ್ತಿಲ್ಲ",
+      "topic": "ನನ್ನ  ಮಂಡಳಿ, ಮಾಧ್ಯಮ, ತರಗತಿ ಮತ್ತು ವಿಷಯ ಕಾಣುತ್ತಿಲ್ಲ",
       "description": "ನಿಮ್ಮ ರಾಜ್ಯವು ಸದ್ಯಕ್ಕೆ ಎಲ್ಲ ಮಂಡಳಿಗಳು, ಮಾಧ್ಯಮಗಳು, ತರಗತಿಗಳು ಮತ್ತು ವಿಷಯಗಳನ್ನು ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ. ನಿಮ್ಮ ರಾಜ್ಯವು ಅವುಗಳನ್ನು ಸೇರಿಸಿದ ನಂತರ, ನೀವು ಪಟ್ಟಿಯಲ್ಲಿ ಅವನ್ನು ಕಾಣುತ್ತೀರಿ "
     },
     {
       "topic": "ನಾನು ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿದೆ, ಆದರೆ ಪ್ಲೇ ಮಾಡಲು ಆಗುತ್ತಿಲ್ಲ, ಯಾಕೆಂದರೆ ಅದು ಇಂಟರ್ನೆಟ್ ಬೇಕೆಂದು ಹೇಳುತ್ತಿದೆ",
-      "description": "ನೀವು ಯು ಟ್ಯೂಬ್ ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿರಬಹುದು. ನೀವು ಆನ್ಲೈನ್ ಇದ್ದಾಗ ಮಾತ್ರ ಯು ಟ್ಯೂಬ್ ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಬಹುದು. ಕಂಪ್ಯೂಟರನ್ನು ಇಂಟರ್ನೆಟ್ ಗೆ ಸಂಪರ್ಕಿಸಿ, ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
+      "description": "ನೀವು ಯು ಟ್ಯೂಬ್ ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿರಬಹುದು. ನೀವು ಆನ್ಲೈನ್ ಇದ್ದಾಗ ಮಾತ್ರ ಯು  ಟ್ಯೂಬ್ ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಬಹುದು. ಕಂಪ್ಯೂಟರನ್ನು ಇಂಟರ್ನೆಟ್ ಗೆ ಸಂಪರ್ಕಿಸಿ, ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
     },
     {
       "topic": "ನನಗೆ ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಆಪ್ ಅನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಬೇಕಿದೆ",
@@ -22,7 +22,7 @@
     },
     {
       "topic": "ಆಪ್ ತುಂಬಾ ನಿಧಾನವಿದೆ",
-      "description": "ಆಪ್ ಕಾರ್ಯಕ್ಷಮತೆಯನ್ನು ವೇಗವಾಗಿಸಲು, ಕೆಳಗಿನಂತೆ ಮಾಡಿ: \n<br>ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಸಿಸ್ಟಮ್ ಕಾನ್ಫಿಗರೇಶನ್ ಗೆ ಹೋಗಿ. ಕನಿಷ್ಟ ಕಾನ್ಫಿಗರೇಶನ್ ಹೀಗಿರಬೇಕು: \n <ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br> ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಕಾನ್ಫಿಗರೇಶನ್ ಗೆ ಹೊಂದುತ್ತಿದ್ದರೆ ಅಥವಾ ಇದಕ್ಕಿಂದ ಹೆಚ್ಚಿನದಿದ್ದರೆ, ಆಪ್ ಅನ್ನು ರಿಸ್ಟಾರ್ಟ್ ಮಾಡಿ. \n<br>ಹೀಗೆ ಮಾಡಿದ ನಂತರವೂ, ನಿಧಾನವಾಗಿದ್ದರೆ, ಇಲ್ಲಿಗೆ ಹೋಗಿ<b>ಟಾಸ್ಕ್ ಮ್ಯಾನೇಜರ್</b>,\nಬಳಕೆಮಾಡದ ಎಲ್ಲ ಬ್ಯಾಕ್ ಗ್ರೌಂಡ್ ಪ್ರಕ್ರಿಯೆಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು ಕ್ಲಿಕ್ ಮಾಡಿ <b>ಎಂಡ್ ಟಾಸ್ಕ್</b>"
+      "description": "ಆಪ್ ಕಾರ್ಯಕ್ಷಮತೆಯನ್ನು ವೇಗವಾಗಿಸಲು, ಕೆಳಗಿನಂತೆ ಮಾಡಿ: \n<br>ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಸಿಸ್ಟಮ್ ಕಾನ್ಫಿಗರೇಶನ್ ಗೆ ಹೋಗಿ. ಕನಿಷ್ಟ ಕಾನ್ಫಿಗರೇಶನ್ ಹೀಗಿರಬೇಕು: \n <ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br> ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಕಾನ್ಫಿಗರೇಶನ್ ಗೆ ಹೊಂದುತ್ತಿದ್ದರೆ ಅಥವಾ ಇದಕ್ಕಿಂದ ಹೆಚ್ಚಿನದಿದ್ದರೆ, ಆಪ್ ಅನ್ನು ರಿಸ್ಟಾರ್ಟ್ ಮಾಡಿ.  \n<br>ಹೀಗೆ ಮಾಡಿದ ನಂತರವೂ, ನಿಧಾನವಾಗಿದ್ದರೆ, ಇಲ್ಲಿಗೆ ಹೋಗಿ<b>ಟಾಸ್ಕ್ ಮ್ಯಾನೇಜರ್</b>,\nಬಳಕೆಮಾಡದ ಎಲ್ಲ ಬ್ಯಾಕ್ ಗ್ರೌಂಡ್ ಪ್ರಕ್ರಿಯೆಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು ಕ್ಲಿಕ್ ಮಾಡಿ <b>ಎಂಡ್ ಟಾಸ್ಕ್</b>"
     },
     {
       "topic": "ನನಗೆ ಪಠ್ಯಾಂಶವನ್ನು ಪೆನ್ ಡ್ರೈವಿಗೆ ಕಾಪಿ ಮಾಡಲು ಆಗುತ್ತಿಲ್ಲ",
@@ -33,16 +33,28 @@
       "description": "ನಿಮ್ಮ ಪೆನ್ ಡ್ರೈವ್ ಅಥವಾ ಕಂಪ್ಯೂಟರ್ ಗೆ ವೈರಸ್ ದಾಳಿಯಾಗಿರಬಹುದು. ಇದನ್ನು ಪರೀಕ್ಷಿಸಿ: \n* ನಿಮ್ಮ ಸಿಸ್ಟಮ್ ನಲ್ಲಿ ಆಂಟಿ ವೈರಸ್ ಸಾಫ್ಟ್ ವೇರ್ ಇನ್ ಸ್ಟಾಲ್ ಆಗಿದೆಯೇ ನೋಡಿ\n* ಅಪರಿಚಿತ ಕಂಪ್ಯೂಟರ್ ಗೆ ನಿಮ್ಮ ಪೆನ್ ಡ್ರೈವ್ ಹಾಕುವ ಮೊದಲು, ಅದು ರೈಟ್-ಪ್ರೊಟೆಕ್ಟೆಡ್ ಆಗಿದೆಯೇ ನೋಡಿ"
     },
     {
-      "topic": "ಪಠ್ಯಾಂಶವನ್ನು ನನ್ನ ಪೆನ್ ಡ್ರೈವಿಗೆ ಮತ್ತು ನನ್ನ ಪೆನ್ ಡ್ರೈವಿನಿಂದ ಕಾಪಿ ಮಾಡಲು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ",
+      "topic": "ಪಠ್ಯಾಂಶವನ್ನು ನನ್ನ ಪೆನ್ ಡ್ರೈವಿಗೆ ಮತ್ತು ನನ್ನ  ಪೆನ್ ಡ್ರೈವಿನಿಂದ ಕಾಪಿ ಮಾಡಲು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ",
       "description": "ಕಾಪಿ ಮಾಡಲು ತೆಗೆದುಕೊಳ್ಳುವ ಸಮಯವು ಪಠ್ಯಾಂಶ ಫೈಲಿನ ಗಾತ್ರವನ್ನು ಅವಲಂಬಿಸಿರುತ್ತದೆ. ದೊಡ್ಡ ಪಠ್ಯಪುಸ್ತಕಗಳಾದರೆ ಕಾಪಿಯಾಗಲು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತವೆ. ಮಧ್ಯದಲ್ಲಿ ಕಾಪಿ ಪ್ರಕ್ರಿಯೆಯನ್ನು ನಿಲ್ಲಿಸಬೇಡಿ. ಹಾಗೆ ಮಾಡಿದರೆ ಫೈಲುಗಳು ಸರಿಯಾಗಿ ಕಾಪಿಯಾಗುವುದಿಲ್ಲ."
     },
     {
       "topic": "ದೀಕ್ಷಾ ಪಠ್ಯಾಂಶದಿಂದಾಗಿ ನನ್ನ ಕಂಪ್ಯೂಟರಿನಲ್ಲಿ ಖಾಲಿ ಜಾಗ ಉಳಿದಿಲ್ಲ",
-      "description": "ನಿಮ್ಮ ಕಂಪ್ಯೂಟರಿನಲ್ಲಿ ಜಾಗ ಖಾಲಿ ಮಾಡಲು ಆಪ್ ನ ಮೈ ಡೌನ್ಲೋಡ್ಸ್ ಟ್ಯಾಬಿನಿಂದ ಡೌನ್ಲೋಡ್ ಆಗಿರುವ ಪಠ್ಯಾಂಶಗಳನ್ನು ಡಿಲೀಟ್ ಮಾಡಿ"
+      "description": "ನಿಮ್ಮ ಕಂಪ್ಯೂಟರಿನಲ್ಲಿ ಜಾಗ ಖಾಲಿ ಮಾಡಲು ಆಪ್ ನ ಮೈ ಡೌನ್ಲೋಡ್ಸ್ ಟ್ಯಾಬಿನಿಂದ  ಡೌನ್ಲೋಡ್ ಆಗಿರುವ ಪಠ್ಯಾಂಶಗಳನ್ನು ಡಿಲೀಟ್ ಮಾಡಿ"
     },
     {
-      "topic": "ನನ್ನ ಉಬಂಟು ಸಿಸ್ಟಮ್ ನಲ್ಲಿ ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪಿಸಲು ಆಗುತ್ತಿಲ್ಲ",
-      "description": "<p>ನಿಮ್ಮ ಉಬಂಟು ಸಿಸ್ಟಮ್ ನಲ್ಲಿ ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಅಪ್ಲಿಕೇಷನ್ ಹಾಕಿಕೊಳ್ಳಲು:<p>\n<p>1) ನಿಮ್ಮ ಟರ್ಮಿನಲ್ ಓಪನ್ ಮಾಡಿ</p> \n<p>2) ಕಮಾಂಡ್ ಸಿಡಿ ರನ್ ಮಾಡಿ <location> exe ಫೈಲ್ ಡೌನ್ಲೋಡ್ ಆಗಿರುವಲ್ಲಿ ಡೈರೆಕ್ಟರಿಯನ್ನು ಬದಲಿಸಲು. ಉದಾಹರಣೆಗೆ, exe ಯು ಡೌನ್ಲೋಡ್ಸ್ ಫೋಲ್ಡರಿನಲ್ಲಿ ಸೇವ್ ಆಗಿದ್ದರೆ, ಆಗ ಕಮಾಂಡ್ ಸಿಡಿ ಡೌನ್ಲೋಡ್ಸ್ ಅನ್ನು ರನ್ ಮಾಡಿ</p>\n<p>3) ಕಮಾಂಡ್ sudo dpkg ರನ್ ಮಾಡಿ -i <filename></p>\n<p>ಈ ಕಮಾಂಡ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ರನ್ ಮಾಡಿದ ನಂತರ, ಅಪ್ಲಿಕೇಶನ್ ಶುರುವಾಗುತ್ತದೆ</p>"
+      "topic": "ನನ್ನ ಉಬಂಟು ಸಿಸ್ಟಮ್ ನಲ್ಲಿ  ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪಿಸಲು ಆಗುತ್ತಿಲ್ಲ",
+      "description": "<p>ನಿಮ್ಮ ಉಬಂಟು ಸಿಸ್ಟಮ್ ನಲ್ಲಿ ದೀಕ್ಷಾ ಡೆಸ್ಕ್ ಟಾಪ್ ಅಪ್ಲಿಕೇಷನ್ ಹಾಕಿಕೊಳ್ಳಲು:<p>\n<p>1) ನಿಮ್ಮ ಟರ್ಮಿನಲ್ ಓಪನ್ ಮಾಡಿ</p>  \n<p>2) ಕಮಾಂಡ್ ಸಿಡಿ ರನ್ ಮಾಡಿ <location>  exe ಫೈಲ್ ಡೌನ್ಲೋಡ್ ಆಗಿರುವಲ್ಲಿ ಡೈರೆಕ್ಟರಿಯನ್ನು ಬದಲಿಸಲು. ಉದಾಹರಣೆಗೆ, exe ಯು ಡೌನ್ಲೋಡ್ಸ್ ಫೋಲ್ಡರಿನಲ್ಲಿ ಸೇವ್ ಆಗಿದ್ದರೆ,  ಆಗ ಕಮಾಂಡ್ ಸಿಡಿ ಡೌನ್ಲೋಡ್ಸ್ ಅನ್ನು ರನ್ ಮಾಡಿ</p>\n<p>3) ಕಮಾಂಡ್ sudo dpkg ರನ್ ಮಾಡಿ -i <filename></p>\n<p>ಈ ಕಮಾಂಡ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ರನ್ ಮಾಡಿದ ನಂತರ, ಅಪ್ಲಿಕೇಶನ್ ಶುರುವಾಗುತ್ತದೆ</p>"
+    },
+    {
+      "topic": "ನನಗೆ ದೀಕ್ಷಾದಲ್ಲಿ ನೋಂದಾಯಿಸಿಕೊಳ್ಳಬೇಕಿದೆ",
+      "description": "ದೀಕ್ಷಾದಲ್ಲಿ ಸೈನ್ ಅಪ್ ಆಗಲು: \n<ul>\n<li>ಇಲ್ಲಿ ಹೋಗಿ <a href =\"https://staging.sunbirded.org/explore\"target=\"_blank\">ದೀಕ್ಷಾ ಅನ್ವೇಷಿಸಿ </a> </li>\n<li>ನೀವು ಶಿಕ್ಷಕರೋ ಅಥವಾ ವಿದ್ಯಾರ್ಥಿಯೋ ಎಂದು ಆಯ್ಕೆ ಮಾಡಿ </li>\n<li>ನಿಮ್ಮ ಸ್ಥಳದ ವಿವರಗಳನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಿ</li>\n<li>ಪ್ರೊಫೈಲ್ ಐಕಾನ್ ಕ್ಲಿಕ್ ಮಾಡಿ</li>\n<li>ಕ್ಲಿಕ್ <b>ಲಾಗಿನ್</b></li>\n<li>ಕ್ಲಿಕ್<b>ಇಲ್ಲಿ ನೋಂದಾಯಿಸಿ</b>ಲಾಗಿನ್ ಪರದೆ ಮೇಲೆ</li>\n<li>ಹೇಗೆ ನೋಂದಾಯಿಸುವುದು ವಿವರಗಳಿಗೆ ಇಲ್ಲಿ ನೋಡಿhttps://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html</li>\n</ul>"
+    },
+    {
+      "topic": "ನಾನು ಪಾಸ್ ವರ್ಡ್ ಮರೆತೆ",
+      "description": "<p>ನಿಮ್ಮ ಪಾಸ್ ವರ್ಡ್ ರಿಸೆಟ್ ಮಾಡಲು, ಈ ಹಂತಗಳನ್ನು ಅನುಸರಿಸಿ ಮತ್ತು ನಿಮ್ಮ ಅಕೌಂಟ್ ಪುನಃ ಪಡೆದುಕೊಳ್ಳಿ:</p>\n<ul>\n<li>ಕ್ಲಿಕ್ <ಸ್ಟ್ರಾಂಗ್>ಪಾಸ್ ವರ್ಡ್ ಮರೆಯಿತು</ಸ್ಟ್ರಾಂಗ್></li>\n<li>ದೀಕ್ಷಾದಲ್ಲಿ ನೋಂದಾಯಿಸಿಕೊಳ್ಳುವಾಗ ನೀವು ನೀಡಿದ ಇಮೇಲ್ ಐಡಿ ಅಥವಾ ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಮತ್ತು ಬಳಕೆದಾರರ ಹೆಸರನ್ನು ಹಾಕಿರಿ </li>\n<li><br></li>\n<li>ನಿಮ್ಮ ನೋಂದಾಯಿತ ಇಮೇಲ್ ಅಥವಾ ಮೊಬೈಲ್ ಸಂಖ್ಯೆಗೆ ಒಂದು ಒಟಿಪಿ ಬರುತ್ತದೆ</li>\n<li><br></li>\n<li>ನಿಮ್ಮ ಅಕೌಂಟನ್ನು ಪುನಃ ಪಡೆಯಲು ಪಾಸ್ ವರ್ಡ್ ರಿಸೆಟ್ ಮಾಡಲು ಒಟಿಪಿಯನ್ನು ಹಾಕಿರಿ</li>\n<li>ನಿಮ್ಮ ಪಾಸ್ ವರ್ಡ್ ರಿಸೆಟ್ ಮಾಡಲು ವಿವರಗಳಿಗಾಗಿ, ಇದನ್ನು ನೋಡಿ <a href=\"https://staging.sunbirded.org/help/getting-started/recover-password/index.htmltarget=_blank\">ಪಾಸ್ ವರ್ಡ್ ರಿಕವರ್</a></li>\n</ul>"
+    },
+    {
+      "topic": "ನನಗೆ ನನ್ನ ಪ್ರೊಫೈಲ್ ವಿವರಗಳನ್ನು ಪರಿಷ್ಕರಿಸಬೇಕಿದೆ",
+      "description": "ನೀವು ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ನಲ್ಲಿ ಈ ಕೆಳಗಿನ ವಿವರಗಳನ್ನು ಪರಿಷ್ಕರಿಸಬಹುದು: \n<ul>\n<li>ಹೆಸರು, ರಾಜ್ಯ ಮತ್ತು ಜಿಲ್ಲೆ ಇಂತಹ ವೈಯಕ್ತಿಕ ವಿವರಗಳು</li>\n<li>ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಮತ್ತು ಇಮೇಲ್ ವಿಳಾಸದಂತಹ ಸಂಪರ್ಕ ವಿವರಗಳು</li>\n<li>ಮಂಡಳಿ, ಮಾಧ್ಯಮ, ವಿಷಯ ಮತ್ತು ತರಗತಿ, ಇತ್ಯಾದಿ ಬೇರೆ ವಿವರಗಳು</li>\nಪ್ರೊಫೈಲ್ ವಿವರಗಳನ್ನು ಹೇಗೆ ಪರಿಷ್ಕರಿಸಬೇಕು ಎಂಬುದಕ್ಕೆ ಇದನ್ನು ನೋಡಿ\n<a href=\"https://staging.sunbirded.org/help/getting-started/user-profile/index.html\"target=\"_blank\">User profile</a>"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-ml.json b/utils/DesktopFAQ/faq-ml.json
index d0b40c43e..379212f92 100644
--- a/utils/DesktopFAQ/faq-ml.json
+++ b/utils/DesktopFAQ/faq-ml.json
@@ -5,44 +5,56 @@
       "description": "നിങ്ങളുടെ സംസ്ഥാനം നിലവിൽ എല്ലാ ബോർഡുകളും മീഡിയങ്ങളും ക്ലാസുകളും വിഷയങ്ങളും പിന്തുണയ്ക്കുന്നില്ല. നിങ്ങളുടെ സംസ്ഥാനം അവരെ ചേർത്താലുടൻ, നിങ്ങൾക്ക് അത് പട്ടികയിൽ കാണാം "
     },
     {
-      "topic": "ഞാൻ ഉള്ളടക്കം ഡ download ൺലോഡ് ചെയ്തു, പക്ഷേ എനിക്ക് ഇന്റർനെറ്റ് ആവശ്യമാണെന്ന് പറയുന്നതിനാൽ എനിക്ക് പ്ലേ ചെയ്യാൻ കഴിയില്ല",
-      "description": "നിങ്ങൾ YouTube ഉള്ളടക്കം ഡൗൺലോഡ് ചെയ്തിരിക്കാം. നിങ്ങൾ ഓൺലൈനിൽ ആയിരിക്കുമ്പോൾ മാത്രമേ നിങ്ങൾക്ക് YouTube ഉള്ളടക്കം പ്ലേ ചെയ്യാൻ കഴിയൂ. കമ്പ്യൂട്ടർ ഇന്റർനെറ്റിലേക്ക് കണക്റ്റു ചെയ്‌തു വീണ്ടും ശ്രമിക്കുക."
+      "topic": "ഞാൻ ഉള്ളടക്കം ഡ download ൺലോഡ് ചെയ്തു, പക്ഷേ എനിക്ക് ഇന്റർനെറ്റ് ആവശ്യമാണെന്ന് പറയുന്നതിനാൽ എനിക്ക്  പ്ലേ ചെയ്യാൻ കഴിയില്ല",
+      "description": "നിങ്ങൾ YouTube ഉള്ളടക്കം ഡൗൺലോഡ് ചെയ്തിരിക്കാം. നിങ്ങൾ ഓൺലൈനിൽ ആയിരിക്കുമ്പോൾ മാത്രമേ നിങ്ങൾക്ക് YouTube ഉള്ളടക്കം പ്ലേ ചെയ്യാൻ കഴിയൂ. കമ്പ്യൂട്ടർ ഇന്റർനെറ്റിലേക്ക് കണക്റ്റു ചെയ്‌തു  വീണ്ടും ശ്രമിക്കുക."
     },
     {
-      "topic": "എന്റെ DIKSHA ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ അപ്‌ഡേറ്റ് ചെയ്യേണ്ടതുണ്ട്",
+      "topic": "എന്റെ SUNBIRD ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ അപ്‌ഡേറ്റ് ചെയ്യേണ്ടതുണ്ട്",
       "description": "നിങ്ങളുടെ കമ്പ്യൂട്ടർ ഇന്റർനെറ്റിലേക്ക് കണക്റ്റുചെയ്‌ത് ഏറ്റവും പുതിയ അപ്ലിക്കേഷൻ പതിപ്പിനായി https://staging.sunbirded.org/desktop/latest പരിശോധിക്കുക"
     },
     {
       "topic": "എനിക്ക് ഇന്റർനെറ്റ് കണക്ഷനുള്ള ഒരു ലാപ്‌ടോപ്പ് ഇല്ല, പക്ഷേ ഡെസ്‌ക്‌ടോപ്പ് അപ്ലിക്കേഷനിൽ ഉള്ളടക്കം ചേർക്കാനോ അപ്‌ഡേറ്റുചെയ്യാനോ ഞാൻ ആഗ്രഹിക്കുന്നു",
-      "description": "നിങ്ങൾക്ക് ഒരു മൊബൈൽ ഫോൺ ഉണ്ടെങ്കിൽ, google പ്ലേസ്റ്റോറിൽ നിന്ന് DIKSHA മൊബൈൽ അപ്ലിക്കേഷൻ ഡൗൺലോഡുചെയ്യുക. അപ്ലിക്കേഷനിലെ ഉള്ളടക്കത്തിനായി ബ്രൗസുചെയ്യുക. DIKSHA ലൈബ്രറിയിൽ നിന്ന് ഉള്ളടക്കം ഡൗൺലോഡുചെയ്യുക.ഒരു പെൻഡ്രൈവ് അല്ലെങ്കിൽ SD കാർഡിൽ പകർത്തി അത് DIKSHA ഡെസ്‌ക്‌ടോപ്പ് അപ്ലിക്കേഷനിൽ അപ്‌ലോഡുചെയ്യുക."
+      "description": "നിങ്ങൾക്ക് ഒരു മൊബൈൽ ഫോൺ ഉണ്ടെങ്കിൽ, google പ്ലേസ്റ്റോറിൽ നിന്ന് SUNBIRD മൊബൈൽ അപ്ലിക്കേഷൻ ഡൗൺലോഡുചെയ്യുക. അപ്ലിക്കേഷനിലെ ഉള്ളടക്കത്തിനായി ബ്രൗസുചെയ്യുക. SUNBIRD ലൈബ്രറിയിൽ നിന്ന് ഉള്ളടക്കം ഡൗൺലോഡുചെയ്യുക.ഒരു പെൻഡ്രൈവ് അല്ലെങ്കിൽ SD കാർഡിൽ പകർത്തി അത് SUNBIRD ഡെസ്‌ക്‌ടോപ്പ് അപ്ലിക്കേഷനിൽ അപ്‌ലോഡുചെയ്യുക."
     },
     {
       "topic": "ഒരു പ്രത്യേക വിഷയത്തിൽ എനിക്ക് ഉള്ളടക്കം കണ്ടെത്താൻ കഴിയില്ല, അല്ലെങ്കിൽ എനിക്ക് ലഭിക്കുന്ന ഉള്ളടക്കം അപ്രസക്തമാണ്",
-      "description": "ഉള്ളടക്കത്തിനായി തിരയുന്നതിന് DIKSHA യുടെ ഓൺലൈൻ ലൈബ്രറി ബ്രൗസ് ചെയ്യുക.അവിടെ ലഭ്യമല്ലെങ്കിൽ, ഉള്ളടക്കത്തെക്കുറിച്ചുള്ള നിങ്ങളുടെ ഫീഡ്ബാക്ക് സംസ്ഥാന SCERT ലേക്ക് അയയ്ക്കുക"
+      "description": "ഉള്ളടക്കത്തിനായി തിരയുന്നതിന് SUNBIRD യുടെ ഓൺലൈൻ ലൈബ്രറി ബ്രൗസ് ചെയ്യുക.അവിടെ   ലഭ്യമല്ലെങ്കിൽ, ഉള്ളടക്കത്തെക്കുറിച്ചുള്ള നിങ്ങളുടെ ഫീഡ്ബാക്ക് സംസ്ഥാന SCERT ലേക്ക് അയയ്ക്കുക"
     },
     {
-      "topic": "അപ്ലിക്കേഷൻ മന്ദഗതിയിലാണ്",
+      "topic": "അപ്ലിക്കേഷൻ  മന്ദഗതിയിലാണ്",
       "description": "അപ്ലിക്കേഷൻ പ്രകടനം വേഗത്തിലാക്കാൻ,ചുവടെപറയുന്നവ ചെയ്യുക:\n<br>നിങ്ങളുടെ കമ്പ്യൂട്ടറിന്റെ സിസ്റ്റം കോൺഫിഗറേഷനിലേക്ക് പോകുക. ഏറ്റവും കുറഞ്ഞ കോൺഫിഗറേഷൻ ഇതായിരിക്കണം:\n<ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br>നിങ്ങളുടെ കമ്പ്യൂട്ടറിന്റെ കോൺഫിഗറേഷൻ തുല്യമോ അതിൽ കൂടുതലോ ആണെങ്കിൽ, അപ്ലിക്കേഷൻ പുനരാരംഭിക്കുക.\n<br>ഇത് ചെയ്തതിനു ശേഷവും അപ്ലിക്കേഷൻ മന്ദഗതിയിലാണെങ്കിൽ, <b> ടാസ്ക് മാനേജർ </b> ലേക്ക് പോകുക,ഉപയോഗിക്കാത്ത എല്ലാ പശ്ചാത്തല പ്രക്രിയകളും തിരഞ്ഞെടുത്ത് <b> ടാസ്ക് അവസാനിപ്പിക്കുക </b> ക്ലിക്കുചെയ്യുക"
     },
     {
       "topic": " പെൻഡ്രൈവിലേക്ക് ഉള്ളടക്കം പകർത്താൻ എനിക്ക് കഴിയില്ല ",
-      "description": "ഒരു പെൻ ഡ്രൈവിലേക്ക് ഉള്ളടക്കം പകർത്താൻ,ചുവടെപറയുന്നവ ചെയ്യുക:\n<ul><li>നിങ്ങളുടെ കമ്പ്യൂട്ടർ ക്രമീകരണങ്ങളിലേക്ക് പോകുക.USB ഡ്രൈവ് എഴുത്ത് പരിരക്ഷിതമാണോയെന്ന് പരിശോധിക്കുക. അങ്ങനെയാണെങ്കിൽ, പരിരക്ഷണം പ്രവർത്തനരഹിതമാക്കുക</li>\n<li>പെൻഡ്രൈവിൽ ഇടമുണ്ടോയെന്ന് പരിശോധിക്കുക. പെൻഡ്രൈവിൽ നിന്ന് അനാവശ്യ ഫയലുകൾ ഡിലീറ്റ് ചെയ്യുക</li></ul> "
+      "description": "ഒരു പെൻ ഡ്രൈവിലേക്ക് ഉള്ളടക്കം പകർത്താൻ,ചുവടെപറയുന്നവ  ചെയ്യുക:\n<ul><li>നിങ്ങളുടെ കമ്പ്യൂട്ടർ ക്രമീകരണങ്ങളിലേക്ക് പോകുക.USB ഡ്രൈവ്  എഴുത്ത് പരിരക്ഷിതമാണോയെന്ന് പരിശോധിക്കുക. അങ്ങനെയാണെങ്കിൽ, പരിരക്ഷണം പ്രവർത്തനരഹിതമാക്കുക</li>\n<li>പെൻഡ്രൈവിൽ  ഇടമുണ്ടോയെന്ന് പരിശോധിക്കുക. പെൻഡ്രൈവിൽ നിന്ന് അനാവശ്യ ഫയലുകൾ  ഡിലീറ്റ് ചെയ്യുക</li></ul> "
     },
     {
       "topic": "എന്റെ പെൻ‌ഡ്രൈവിൽ ഞാൻ ഉള്ളടക്കം ലോഡുചെയ്തിരുന്നു, പക്ഷേ ഇപ്പോൾ അത് ശൂന്യമായി ഞാൻ കാണുന്നു",
       "description": "നിങ്ങളുടെ പെൻ ഡ്രൈവ് അല്ലെങ്കിൽ കമ്പ്യൂട്ടർ ഒരു വൈറസ് ബാധിച്ചേക്കാം. പരിശോധിക്കുക:\n* നിങ്ങളുടെ ഉപകരണത്തിൽ ആന്റി വൈറസ് സോഫ്റ്റ്വെയർ ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ടോ \n* അജ്ഞാത ഉപകരണങ്ങളിലേക്ക് കണക്റ്റുചെയ്യുന്നതിന് മുമ്പ് നിങ്ങളുടെ പെൻ ഡ്രൈവ് പുനരാലേഖനം ചെയ്യപ്പെടുന്നുണ്ടോ"
     },
     {
-      "topic": "എന്റെ പെൻ ഡ്രൈവിലേക്കും പെൻ ഡ്രൈവിൽ നിന്നോ ഉള്ളടക്കം പകർത്താൻ സമയമെടുക്കും",
-      "description": "പകർത്താൻ എടുക്കുന്ന സമയം ഉള്ളടക്ക ഫയലിന്റെ വലുപ്പത്തെ ആശ്രയിച്ചിരിക്കുന്നു. ചില വലിയ പാഠപുസ്തകങ്ങൾ പകർത്താൻ സമയമെടുക്കും.അതിനിടയിൽ പ്രക്രിയ നിർത്തരുതെന്ന് ഞങ്ങൾ ശുപാർശ ചെയ്യുന്നു. അങ്ങനെ ചെയ്യുന്നത് പൊരുത്തമില്ലാത്ത ഫയലുകളിലേക്ക് നയിച്ചേക്കാം."
+      "topic": "എന്റെ പെൻ ഡ്രൈവിലേക്കും  പെൻ ഡ്രൈവിൽ നിന്നോ ഉള്ളടക്കം പകർത്താൻ സമയമെടുക്കും",
+      "description": "പകർത്താൻ എടുക്കുന്ന സമയം ഉള്ളടക്ക ഫയലിന്റെ വലുപ്പത്തെ ആശ്രയിച്ചിരിക്കുന്നു. ചില വലിയ പാഠപുസ്തകങ്ങൾ പകർത്താൻ സമയമെടുക്കും.അതിനിടയിൽ  പ്രക്രിയ നിർത്തരുതെന്ന് ഞങ്ങൾ ശുപാർശ ചെയ്യുന്നു. അങ്ങനെ ചെയ്യുന്നത് പൊരുത്തമില്ലാത്ത ഫയലുകളിലേക്ക് നയിച്ചേക്കാം."
     },
     {
-      "topic": "DIKSHA ഉള്ളടക്കം കാരണം എന്റെ കമ്പ്യൂട്ടറിൽ ഇടമില്ല",
+      "topic": "SUNBIRD ഉള്ളടക്കം കാരണം എന്റെ കമ്പ്യൂട്ടറിൽ  ഇടമില്ല",
       "description": "നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ ഇടം ശൂന്യമാക്കുന്നതിന് അപ്ലിക്കേഷന്റെ എന്റെ ഡൗൺലോഡുകൾ ടാബിൽ നിന്ന് ഡൗൺലോഡുചെയ്‌ത ഉള്ളടക്കം ഡിലീറ്റ് ചെയ്യുക"
     },
     {
-      "topic": "എന്റെ ഉബുണ്ടു സിസ്റ്റത്തിൽ DIKSHA ഡെസ്ക്ടോപ്പ് ആപ്ലിക്കേഷൻ ഇൻസ്റ്റാൾ ചെയ്യാൻ കഴിയുന്നില്ല ",
-      "description": "<p> നിങ്ങളുടെ ഉബുണ്ടു സിസ്റ്റത്തിൽ DIKSHA ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ ഇൻസ്റ്റാൾ ചെയ്യുന്നതിന്: </p> <p>1) നിങ്ങളുടെ ടെർമിനൽ തുറക്കുക </p> \n<p> 2)exe ഫയൽ ഡൗൺലോഡ് ‌ചെയ്‌ത സ്ഥലത്തേക്ക് ഡയറക്‌ടറി മാറ്റുന്നതിന് <location>cd കമാൻഡ് പ്രവർത്തിപ്പിക്കുക. ഉദാഹരണത്തിന്, ഡൗൺലോഡ് ഫോൾ‌ഡറിൽ‌ exe സംരക്ഷിച്ചിട്ടുണ്ടെങ്കിൽ‌,കമാൻഡ് cd ഡൗൺലോഡുകൾ പ്രവർത്തിപ്പിക്കുക</p>\n<p>3) sudo dpkg -i കമാൻഡ് പ്രവർത്തിപ്പിക്കുക <filename> </p>\n<p> ഈ കമാൻഡ് വിജയകരമായി പ്രവർത്തിപ്പിക്കുമ്പോൾ അപ്ലിക്കേഷൻ സമാരംഭിച്ചു </p>"
+      "topic": "എന്റെ ഉബുണ്ടു സിസ്റ്റത്തിൽ SUNBIRD ഡെസ്ക്ടോപ്പ് ആപ്ലിക്കേഷൻ ഇൻസ്റ്റാൾ ചെയ്യാൻ കഴിയുന്നില്ല ",
+      "description": "<p> നിങ്ങളുടെ ഉബുണ്ടു സിസ്റ്റത്തിൽ SUNBIRD ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ ഇൻസ്റ്റാൾ ചെയ്യുന്നതിന്: </p> <p>1) നിങ്ങളുടെ ടെർമിനൽ തുറക്കുക </p> \n<p> 2)exe ഫയൽ ഡൗൺലോഡ് ‌ചെയ്‌ത സ്ഥലത്തേക്ക് ഡയറക്‌ടറി മാറ്റുന്നതിന് <location>cd കമാൻഡ് പ്രവർത്തിപ്പിക്കുക. ഉദാഹരണത്തിന്, ഡൗൺലോഡ്  ഫോൾ‌ഡറിൽ‌ exe സംരക്ഷിച്ചിട്ടുണ്ടെങ്കിൽ‌,കമാൻഡ് cd ഡൗൺലോഡുകൾ  പ്രവർത്തിപ്പിക്കുക</p>\n<p>3) sudo dpkg -i കമാൻഡ് പ്രവർത്തിപ്പിക്കുക <filename> </p>\n<p> ഈ കമാൻഡ് വിജയകരമായി പ്രവർത്തിപ്പിക്കുമ്പോൾ അപ്ലിക്കേഷൻ സമാരംഭിച്ചു </p>"
+    },
+    {
+      "topic": "എനിക്ക് SUNBIRD ൽ രജിസ്റ്റർ ചെയ്യണം",
+      "description": "SUNBIRD- ൽ സൈൻ അപ്പ് ചെയ്യുന്നതിന്:\n <ul>\n <li> <a href =\"https://staging.sunbirded.org/explore\"target=\"_blank\"> SUNBIRD പര്യവേക്ഷണം ചെയ്യുക </a> </li> \n<li> നിങ്ങൾ ഒരു അധ്യാപകനോ വിദ്യാർത്ഥിയോ ആണെന്ന് തിരഞ്ഞെടുക്കുക </li> \n<li> നിങ്ങളുടെ ലൊക്കേഷൻ വിശദാംശങ്ങൾ അപ്‌ഡേറ്റുചെയ്യുക </li> \n<li> പ്രൊഫൈൽ ഐക്കണിൽ ക്ലിക്കുചെയ്യുക </li> <li> <b> ലോഗിൻ </ b> </ li>\n <li> ലോഗിൻ സ്ക്രീനിൽ <b> ഇവിടെ രജിസ്റ്റർ ചെയ്യുക </b> ക്ലിക്കുചെയ്യുക </ li> <li> എങ്ങനെ രജിസ്റ്റർ ചെയ്യാം എന്നതിനെക്കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക് https://staging.sunbirded.org/help/getting-started/sign കാണുക -in / sign-up.html </li> </ul>"
+    },
+    {
+      "topic": " ഞാൻ എന്റെ പാസ്സ്‌വേർഡ് മറന്നു ",
+      "description": "<p> നിങ്ങളുടെ പാസ്‌വേഡ് പുനസജ്ജമാക്കാൻ, ഈ ഘട്ടങ്ങൾ പാലിച്ച് നിങ്ങളുടെ അക്കൗണ്ട് വീണ്ടെടുക്കുക: </p> \n <ul>\n<li> <strong> പാസ്‌വേഡ് മറന്നോ </strong> ക്ലിക്കുചെയ്യുക</li> <li>SUNBIRD ൽ രജിസ്റ്റർ ചെയ്യുമ്പോൾ നിങ്ങൾ നൽകിയ ഇമെയിൽ വിലാസമോ മൊബൈൽ നമ്പറോ ഉപയോക്തൃനാമമോ നൽകുക </li> \n<li> <br> </li> >\n <li> നിങ്ങളുടെ രജിസ്റ്റർ ചെയ്ത ഇമെയിൽ അല്ലെങ്കിൽ മൊബൈൽ നമ്പറിൽ നിങ്ങൾക്ക് ഒരു OTP ലഭിക്കും </li> \n<li> <br> </li>\n <li> നിങ്ങളുടെ പാസ്‌വേഡ് പുനസജ്ജമാക്കുന്നതിനും അക്കൗണ്ട് വീണ്ടെടുക്കുന്നതിനും OTP നൽകുക </li>\n <li > നിങ്ങളുടെ പാസ്‌വേഡ് പുനസജ്ജമാക്കുന്നതിനുള്ള വിശദാംശങ്ങൾക്ക്, <a href=\"https://staging.sunbirded.org/help/getting-started/recover-password/index.htmltarget=_blank\"> പാസ്‌വേഡ് വീണ്ടെടുക്കുക </a> </li> > </ul>"
+    },
+    {
+      "topic": "എന്റെ പ്രൊഫൈൽ വിശദാംശങ്ങൾ എഡിറ്റുചെയ്യാൻ ഞാൻ ആഗ്രഹിക്കുന്നു",
+      "description": "നിങ്ങളുടെ പ്രൊഫൈലിൽ‌ ചുവടെ പറയുന്ന വിശദാംശങ്ങൾ‌ എഡിറ്റുചെയ്യാൻ‌ കഴിയും: <ul>\n <li> പേര്, സംസ്ഥാനം, ജില്ല എന്നിവ പോലുള്ള വ്യക്തിഗത വിശദാംശങ്ങൾ‌ </li>\n <li>മൊബൈൽ‌ നമ്പർ‌, ഇമെയിൽ‌ വിലാസം എന്നിവ പോലുള്ള കോൺ‌ടാക്റ്റ് വിശദാംശങ്ങൾ‌ </li>\n <li> ബോർഡ്, മീഡിയം, വിഷയം, ക്ലാസ് എന്നിവ പോലുള്ള മറ്റ് വിശദാംശങ്ങൾ </li> പ്രൊഫൈൽ വിശദാംശങ്ങൾ എങ്ങനെ എഡിറ്റുചെയ്യാമെന്നതിനെക്കുറിച്ചുള്ള വിശദാംശങ്ങൾക്ക്, <a href = \"https://staging.sunbirded.org/help/getting-started/user-profile /index.html\"target=\"_blank\"> ഉപയോക്തൃ പ്രൊഫൈൽ </a>"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-mr.json b/utils/DesktopFAQ/faq-mr.json
index ba4453fdc..7b7b8cff4 100644
--- a/utils/DesktopFAQ/faq-mr.json
+++ b/utils/DesktopFAQ/faq-mr.json
@@ -5,24 +5,24 @@
       "description": "तुमचे राज्य सध्या सर्व बोर्ड, माध्यमे, इयत्ता व विषयांना समर्थन देत नाही. तुमच्या राज्याने हे जोडताच, तुम्हाला ते यादीत दिसेल."
     },
     {
-      "topic": "मी सामग्री डाउनलोड केली आहे, पण 'इंटरनेट आवश्यक आहे' या कारणास्तव मी ती चालवू शकत नाही ",
+      "topic": "मी सामग्री डाउनलोड केली आहे, पण 'इंटरनेट आवश्यक आहे' या कारणास्तव मी ती चालवू शकत नाही  ",
       "description": "तुम्ही यूट्यूब वरची सामग्री डाउनलोड केलेली असू शकते. तुम्ही यूट्यूब सामग्री फक्त ऑनलाइन असताना चालवू शकता. कॉम्प्युटर इंटरनेटशी जोडून पुन्हा प्रयत्न करा."
     },
     {
-      "topic": "मला माझा DIKSHA डेस्कटॉप ऍप अपडेट करायचा आहे ",
+      "topic": "मला माझा SUNBIRD डेस्कटॉप ऍप अपडेट करायचा आहे ",
       "description": "ऍपच्या नवीनतम आवृत्तीसाठी तुमचा कॉम्प्युटर इंटरनेटशी जोडून https://staging.sunbirded.org/desktop/latest तपासा "
     },
     {
       "topic": "माझ्याकडे इंटरनेट कनेक्शन असलेला लॅपटॉप नाही, पण मला डेस्कटॉप ऍपवर सामग्री जोडायची किंवा अपडेट करायची आहे ",
-      "description": "तुमच्याकडे मोबाइल फोन असल्यास, गूगल प्लेस्टोर वरून DIKSHA मोबाइल ऍप डाउनलोड करा.\nऍपवरून सामग्री ब्राउझ करा.\nDIKSHA लायब्ररी मधून सामग्री डाउनलोड करा.\nती पेन ड्राइव्ह किंवा SD कार्ड वर कॉपी करून DIKSHA डेस्कटॉप ऍपवर अपलोड करा."
+      "description": "तुमच्याकडे मोबाइल फोन असल्यास, गूगल प्लेस्टोर वरून SUNBIRD मोबाइल ऍप डाउनलोड करा.\nऍपवरून सामग्री ब्राउझ करा.\nSUNBIRD लायब्ररी मधून सामग्री डाउनलोड करा.\nती पेन ड्राइव्ह किंवा SD कार्ड वर कॉपी करून SUNBIRD डेस्कटॉप ऍपवर अपलोड करा."
     },
     {
       "topic": "मला एका विशिष्ट विषयाची सामग्री मिळत नाही, किंवा मिळालेली सामग्री असंबद्ध आहे ",
-      "description": "सामग्री शोधण्यासाठी दीक्षा DIKSHAची ऑनलाइन लायब्ररी ब्राउझ करा. तिथेही सामग्री उपलब्ध नसल्यास, तुमचा सामग्री विषयी अभिप्राय राज्य SCERTकडे पाठवा "
+      "description": "सामग्री शोधण्यासाठी दीक्षा SUNBIRDची ऑनलाइन लायब्ररी ब्राउझ करा. तिथेही सामग्री उपलब्ध नसल्यास, तुमचा सामग्री विषयी अभिप्राय राज्य SCERTकडे पाठवा "
     },
     {
       "topic": "ऍपचा वेग खूप कमी आहे ",
-      "description": "तुमच्या ऍपची कार्यक्षमता वाढवण्यासाठी खालीलप्रमाणे करा:\n<br>तुमच्या कॉम्प्युटरच्या सिस्टिम कॉन्फिगरेशन वर जा. तुमचे किमान कॉन्फिगरेशन असायला हवे: \n<ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br>तुमच्या कॉम्पुटरचे कॉन्फिगरेशन एवढे, किंवा यापेक्षा जास्त असल्यास, ऍप पुन्हा सुरू करा.\n<br>हे करूनही ऍपचा वेग कमी असल्यास <b>कार्य व्यवस्थापक</b> इथे जा,\nवापरात नसलेल्या सर्व पार्श्वभूमी प्रक्रिया सिलेक्ट करा व <b>कार्य संपवा</b> क्लिक करा "
+      "description": "तुमच्या ऍपची कार्यक्षमता वाढवण्यासाठी खालीलप्रमाणे करा:\n<br>तुमच्या कॉम्प्युटरच्या सिस्टिम कॉन्फिगरेशन वर जा. तुमचे किमान कॉन्फिगरेशन असायला हवे: \n<ul><li>2 GB RAM</li>\n<li>Dual Core Processor</li></ul>\n<br>तुमच्या कॉम्पुटरचे कॉन्फिगरेशन एवढे, किंवा यापेक्षा जास्त असल्यास, ऍप पुन्हा सुरू करा.\n<br>हे करूनही ऍपचा वेग कमी असल्यास <b>कार्य व्यवस्थापक</b> इथे जा,\nवापरात नसलेल्या सर्व पार्श्वभूमी प्रक्रिया सिलेक्ट करा व <b>कार्य संपवा</b> क्लिक करा  "
     },
     {
       "topic": "मी सामग्री पेन ड्राइव्ह वर कॉपी करू शकत नाही आहे ",
@@ -37,12 +37,24 @@
       "description": "कॉपी करण्यासाठी लागणारा वेळ सामग्रीच्या फाइलच्या आकारमानावर अवलंबून आहे. काही मोठी पाठ्यपुस्तके कॉपी करण्यास वेळ लागतो. कॉपीची प्रक्रिया मध्येच थांबवू नये असा आमचा सल्ला आहे. असे केल्यास फाइल्स मध्ये विसंगती येऊ शकते. "
     },
     {
-      "topic": "DIKSHAच्या सामग्रीमुळे माझ्या कॉम्प्युटरवर मोकळी जागा उरली नाही ",
+      "topic": "SUNBIRDच्या सामग्रीमुळे माझ्या कॉम्प्युटरवर मोकळी जागा उरली नाही ",
       "description": "तुमच्या कॉम्प्युटरवर जागा मोकळी करण्यासाठी, ऍपवरील माझे डाउनलोड टॅब वरून डाउनलोड केलेली सामग्री डिलीट करा "
     },
     {
-      "topic": "माझ्या उबंटू सिस्टिम वर DIKSHA डेस्कटॉप ऍप स्थापित करण्यास अयशस्वी ",
-      "description": "<p>तुमच्या उबंटू सिस्टिम वर DIKSHA डेस्कटॉप ऍप स्थापित करण्यासाठी:</p>\n<p>१) तुमचे टर्मिनल उघडा</p>\n<p>२) निर्देशिका बदलून exe फाइल जिथे डाउनलोड केलेली आहे तिथे नेण्यासाठी cd <स्थान> ही आज्ञा करा. उदा:, exe डाउनलोड फोल्डर मध्ये सेव्ह केली असल्यास, cd Downloads</p> ही आज्ञा करा \n<p>३) sudo dpkg -i <filename></p> ही आज्ञा करा \n<p>ही आज्ञा यशस्वीरीत्या केल्यानंतर हे ऍप सुरू केले जाईल </p>\n"
+      "topic": "माझ्या उबंटू सिस्टिम वर SUNBIRD डेस्कटॉप ऍप स्थापित करण्यास अयशस्वी ",
+      "description": "<p>तुमच्या उबंटू सिस्टिम वर SUNBIRD डेस्कटॉप ऍप स्थापित करण्यासाठी:</p>\n<p>१) तुमचे टर्मिनल उघडा</p>\n<p>२) निर्देशिका बदलून exe फाइल जिथे डाउनलोड केलेली आहे तिथे नेण्यासाठी cd <स्थान> ही आज्ञा करा. उदा:, exe डाउनलोड फोल्डर मध्ये सेव्ह केली असल्यास, cd Downloads</p> ही आज्ञा करा \n<p>३) sudo dpkg -i <filename></p> ही आज्ञा करा \n<p>ही आज्ञा यशस्वीरीत्या केल्यानंतर हे ऍप सुरू केले जाईल </p>\n"
+    },
+    {
+      "topic": "मला SUNBIRD वर स्वतःचे नाव नोंदवायचे आहे ",
+      "description": "SUNBIRD वर नोंदणी करण्यासाठी:\n<ul>\n    <li>इथे जा <a href =\"https://staging.sunbirded.org/explore\"target=\"_blank\">शोधा SUNBIRD </a> </li>\n<li>तुम्ही शिक्षक आहात की विद्यार्थी हे निवडा</li>\n<li>तुमचे स्थानिक तपशील अपडेट करा</li>\n<li>प्रोफाइल चिन्हावर क्लिक करा</li>\n<li>लॉगिन<b>क्लिक करा</b></li>\n<li>लॉगिन पटलावर <b>इथे नोंदणी करा</b> क्लिक करा</li>\n<li>नोंदणी कशी करावी याच्या तपशिलांसाठी इथे पहा https://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html</li>\n</ul>"
+    },
+    {
+      "topic": "मी माझा पासवर्ड विसरलो/विसरले ",
+      "description": "<p>तुमचा पासवर्ड रीसेट करून तुमचे खाते परत मिळवण्यासाठी, खालील क्रमाचे अनुसरण करा:</p><ul>\n       <li><strong>पासवर्ड विसरलात?</strong> क्लिक करा </li>\n       <li>SUNBIRD वर नोंदणी करताना दिलेला ई-मेल ऍड्रेस किंवा मोबाइल नंबर व वापरकर्ता नाव टाका </li>\n       <li><br></li>\n       <li>तुम्हाला तुमच्या नोंदणीकृत ई-मेल किंवा मोबाइल नंबरवर OTP मिळेल</li>\n       <li><br></li>\n       <li>हा OTP टाकून तुमचा पासवर्ड रीसेट करा व तुमचे खाते परत मिळवा</li>"
+    },
+    {
+      "topic": "मला माझ्या प्रोफाइल तपशिलांमध्ये फेरबदल करायचा आहे ",
+      "description": "तुम्ही तुमच्या प्रोफाइल वरचे खालील तपशील बदलू शकता:\n<ul>\n<li>वैयक्तिक तपशील, जसे नाव, राज्य, आणि जिल्हा</li>\n<li>संपर्क तपशील, जसे मोबाइल नंबर व ई-मेल ऍड्रेस</li>\n<li>इतर तपशील, जसे बोर्ड, माध्यम, विषय, व इयत्ता</li>\nप्रोफाइल तपशिलात फेरबदल कसा करावा यासाठी पहा \n<a href=\"https://staging.sunbirded.org/help/getting-started/user-profile/index.html\"target=\"_blank\">वापरकर्ता प्रोफाइल</a>"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-or.json b/utils/DesktopFAQ/faq-or.json
index 315ef2437..fc34e7b7b 100644
--- a/utils/DesktopFAQ/faq-or.json
+++ b/utils/DesktopFAQ/faq-or.json
@@ -9,16 +9,16 @@
       "description": "ଆପଣ YouTube କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରିଥାଇପାରନ୍ତି । କେବଳ ଅନଲାଇନ୍ ଥିବା ସମୟରେ ହିଁ ଆପଣ YouTube କଣ୍ଟେଣ୍ଟ୍ ପ୍ଲେ କରିପାରିବେ । କମ୍ପ୍ୟୁଟରକୁ ଇଣ୍ଟରନେଟ୍ ରେ କନେକ୍ଟ କରନ୍ତୁ ଏବଂ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ ।"
     },
     {
-      "topic": "ମୋର DIKSHA ଡେସ୍କଟପ ଆପ୍ ଅପଡେଟ୍ କରିବାର ଅଛି",
+      "topic": "ମୋର SUNBIRD ଡେସ୍କଟପ ଆପ୍ ଅପଡେଟ୍ କରିବାର ଅଛି",
       "description": "ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରକୁ ଇଣ୍ଟରନେଟରେ କନେକ୍ଟ କରନ୍ତୁ, ଏବଂ ସଦ୍ୟତମ ଆପ୍ ଭର୍ସନ୍ ପାଇଁ ଦେଖନ୍ତୁ, https://staging.sunbirded.org/desktop/latest"
     },
     {
       "topic": "ଇଣ୍ଟରନେଟ୍ କନେକ୍ସନ୍ ଥିବା ଲାପଟପ୍ ମୋ ପାଖରେ ନାହିଁ, କିନ୍ତୁ ମୁଁ ଡେସ୍କଟପ୍ ଆପ୍ ରେ ଥିବା କଣ୍ଟେଣ୍ଟ୍ ଯୋଗ କରିବାକୁ କିମ୍ବା ଅପଡେଟ୍ କରିବାକୁ ଚାହୁଁଛି ।",
-      "description": "ଯଦି ଆପଣଙ୍କର ମୋବାଇଲ୍ ଫୋନ୍ ଥାଏ, ତେବେ google playstore ରୁ DIKSHA ମୋବାଇଲ୍ ଆପ୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ ।\nଆପ୍ ରେ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ ।\nDIKSHA ଲାଇବ୍ରେରୀରୁ କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ ।\nଏହାକୁ ପେନଡ୍ରାଇଭ୍ କିମ୍ବା SD କାର୍ଡରେ କପି କରନ୍ତୁ ଏବଂ DIKSHA ଡେସ୍କଟପ୍ ଆପ୍ ରେ ଅପଲୋଡ୍ କରନ୍ତୁ ।"
+      "description": "ଯଦି ଆପଣଙ୍କର ମୋବାଇଲ୍ ଫୋନ୍ ଥାଏ, ତେବେ google playstore ରୁ SUNBIRD ମୋବାଇଲ୍ ଆପ୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ ।\nଆପ୍ ରେ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ ।\nSUNBIRD ଲାଇବ୍ରେରୀରୁ କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ ।\nଏହାକୁ ପେନଡ୍ରାଇଭ୍ କିମ୍ବା SD କାର୍ଡରେ କପି କରନ୍ତୁ ଏବଂ SUNBIRD ଡେସ୍କଟପ୍ ଆପ୍ ରେ ଅପଲୋଡ୍ କରନ୍ତୁ ।"
     },
     {
       "topic": "ଏକ ନିର୍ଦ୍ଦିଷ୍ଟ ବିଷୟରେ ମୁଁ କଣ୍ଟେଣ୍ଟ୍ ପାଉନାହିଁ, ବା ମୋତେ କଣ୍ଟେଣ୍ଟ୍ ଅପ୍ରାସଙ୍ଗିକ ଲାଗୁଛି",
-      "description": "କଣ୍ଟେଣ୍ଟ୍ ସର୍ଚ୍ଚ କରିବା ପାଇଁ, DIKSHA ର ଅନଲାଇନ୍ ଲାଇବ୍ରେରୀ ବ୍ରାଉଜ୍ କରନ୍ତୁ । ତଥାପି ଯଦି ଏହା ଉପଲବ୍ଧ ନଥାଏ, କଣ୍ଟେଣ୍ଟ୍ ସମ୍ବନ୍ଧରେ ଆପଣଙ୍କ ଫିଡବ୍ୟାକ୍ ରାଜ୍ୟ SCERT କୁ ପଠାନ୍ତୁ "
+      "description": "କଣ୍ଟେଣ୍ଟ୍ ସର୍ଚ୍ଚ କରିବା ପାଇଁ, SUNBIRD ର ଅନଲାଇନ୍ ଲାଇବ୍ରେରୀ ବ୍ରାଉଜ୍ କରନ୍ତୁ ।  ତଥାପି ଯଦି ଏହା ଉପଲବ୍ଧ ନଥାଏ, କଣ୍ଟେଣ୍ଟ୍ ସମ୍ବନ୍ଧରେ ଆପଣଙ୍କ ଫିଡବ୍ୟାକ୍ ରାଜ୍ୟ SCERT କୁ ପଠାନ୍ତୁ "
     },
     {
       "topic": "ଏହି ଆପ୍ ବହୁତ ସ୍ଲୋ ଅଟେ",
@@ -30,19 +30,35 @@
     },
     {
       "topic": "ମୁଁ ପେନଡ୍ରାଇଭରେ କଣ୍ଟେଣ୍ଟ୍ ଲୋଡ୍ କରିଛି, କିନ୍ତୁ ଏବେ ଏହା ଖାଲି ଦେଖାଉଛି ",
-      "description": "ଆପଣଙ୍କ ପେନଡ୍ରାଇଭ୍ କିମ୍ବା କମ୍ପ୍ୟୁଟର ଭାଇରସ୍ ଦ୍ୱାରା ପ୍ରଭାବିତ ହୋଇଥାଇପାରେ । ଯାଞ୍ଚକରନ୍ତୁ କି:\n* ଆପଣଙ୍କ ମେସିନ୍ ରେ ଆଣ୍ଟି ଭାଇରସ୍ ସଫ୍ଟୱେର୍ ଇନଷ୍ଟଲ୍ ହୋଇଛି \n* ଅଜଣା ମେସିନ୍ ସହ ପ୍ଲଗ୍ ଇନ୍ କରିବା ପୂର୍ବରୁ ଯାଞ୍ଚକରନ୍ତୁ କି ଆପଣଙ୍କ ପେନଡ୍ରାଇଭ୍ ରାଇଟ୍-ପ୍ରୋଟେକ୍ଟେଡ୍ ଅଛି "
+      "description": "ଆପଣଙ୍କ ପେନଡ୍ରାଇଭ୍ କିମ୍ବା କମ୍ପ୍ୟୁଟର ଭାଇରସ୍ ଦ୍ୱାରା ପ୍ରଭାବିତ ହୋଇଥାଇପାରେ । ଯାଞ୍ଚକରନ୍ତୁ କି:\n* ଆପଣଙ୍କ ମେସିନ୍ ରେ  ଆଣ୍ଟି ଭାଇରସ୍ ସଫ୍ଟୱେର୍ ଇନଷ୍ଟଲ୍ ହୋଇଛି \n* ଅଜଣା ମେସିନ୍ ସହ ପ୍ଲଗ୍ ଇନ୍ କରିବା ପୂର୍ବରୁ ଯାଞ୍ଚକରନ୍ତୁ କି ଆପଣଙ୍କ ପେନଡ୍ରାଇଭ୍ ରାଇଟ୍-ପ୍ରୋଟେକ୍ଟେଡ୍ ଅଛି "
     },
     {
       "topic": "ମୋ ପେନଡ୍ରାଇଭକୁ ଏବଂ ପେନଡ୍ରାଇଭରୁ କଣ୍ଟେଣ୍ଟ୍ କପି କରିବା ପାଇଁ ଅଧିକ ସମୟ ଲାଗୁଛି ",
       "description": "କପି କରିବାକୁ ଲାଗୁଥିବା ସମୟ କଣ୍ଟେଣ୍ଟ୍ ଫାଇଲର ଆକାର ଉପରେ ନିର୍ଭର କରେ । କିଛି ବୃହତ୍ ପାଠ୍ୟପୁସ୍ତକ କପି ହେବାକୁ ଅଧିକ ସମୟ ଲାଗେ । ଆମେ ସୁପାରିଶ କରୁଛୁ କି ଏହି ପ୍ରକ୍ରିୟା ଚାଲିବା ସମୟରେ ଆପଣ ବନ୍ଦ କରନ୍ତୁ ନାହିଁ । ଏପରି କରିବା ଦ୍ୱାରା ଫାଇଲ୍ ଠିକ୍ ରହିବ ନାହିଁ । "
     },
     {
-      "topic": "DIKSHA କଣ୍ଟେଣ୍ଟ୍ ହେତୁ ମୋ କମ୍ପ୍ୟୁଟରରେ କିଛି ଫ୍ରି ସ୍ପେସ୍ ନାହିଁ ",
+      "topic": "SUNBIRD କଣ୍ଟେଣ୍ଟ୍ ହେତୁ ମୋ କମ୍ପ୍ୟୁଟରରେ କିଛି ଫ୍ରି ସ୍ପେସ୍ ନାହିଁ ",
       "description": "ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରରେ ସ୍ପେସ୍ ଫ୍ରି କରିବା ପାଇଁ, ଆପ୍ ର ମାଇଁ ଡାଉନଲୋଡସ୍ ଟ୍ୟାବ୍ ରୁ ଡାଉନଲୋଡ୍ ହୋଇଥିବା କଣ୍ଟେଣ୍ଟ୍ ଡିଲିଟ୍ କରନ୍ତୁ "
     },
     {
-      "topic": "ମୋ Ubuntu ସିଷ୍ଟମରେ DIKSHA Desktop ଆପ୍ଲିକେସନ୍ ଇନଷ୍ଟଲ୍ କରିବାରେ ବିଫଳ",
-      "description": "<p>ଆପଣଙ୍କ ubuntu ସିଷ୍ଟମରେ DIKSHA ଡେସ୍କଟପ ଆପ୍ଲିକେସନ୍ ଇନଷ୍ଟଲ୍ କରିବା ପାଇଁ:</p>\n<p>1) ଆପଣଙ୍କ ଟର୍ମିନାଲ୍ ଓପନ୍ କରନ୍ତୁ</p>\n<p>2) ଯେଉଁଠାରେ exe ଫାଇଲ୍ ଡାଉନଲୋଡ୍ ହୋଇଛି, ସେହି ଡିରେକ୍ଟୋରି ବଦଳାଇବା ପାଇଁ, command cd<location> ରନ୍ କରନ୍ତୁ । ଉଦାହରଣ ସ୍ୱରୂପ, ଯଦି exe ଫାଇଲ୍ ଡାଉନଲୋଡସ୍ ଫୋଲଡରରେ ସେଭ୍ ହୋଇଛି, ତେବେ command cd Downloads ରନ୍ କରନ୍ତୁ</p>\n<p>3) sudo dpkg -i <filename> ରନ୍ କରନ୍ତୁ</p>\n<p>ଏହି command ସଫଳତାର ସହ ରନ୍ କରିବା ପରେ, ଆପ୍ଲିକେସନ୍ ଲଞ୍ଚ୍ ହେବ </p>"
+      "topic": "ମୋ Ubuntu ସିଷ୍ଟମରେ SUNBIRD Desktop ଆପ୍ଲିକେସନ୍ ଇନଷ୍ଟଲ୍ କରିବାରେ ବିଫଳ",
+      "description": "<p>ଆପଣଙ୍କ ubuntu ସିଷ୍ଟମରେ SUNBIRD ଡେସ୍କଟପ ଆପ୍ଲିକେସନ୍ ଇନଷ୍ଟଲ୍ କରିବା ପାଇଁ:</p>\n<p>1) ଆପଣଙ୍କ ଟର୍ମିନାଲ୍ ଓପନ୍ କରନ୍ତୁ</p>\n<p>2) ଯେଉଁଠାରେ exe ଫାଇଲ୍ ଡାଉନଲୋଡ୍ ହୋଇଛି, ସେହି ଡିରେକ୍ଟୋରି ବଦଳାଇବା ପାଇଁ, command cd<location> ରନ୍ କରନ୍ତୁ । ଉଦାହରଣ ସ୍ୱରୂପ, ଯଦି exe ଫାଇଲ୍ ଡାଉନଲୋଡସ୍ ଫୋଲଡରରେ ସେଭ୍ ହୋଇଛି, ତେବେ command cd Downloads ରନ୍ କରନ୍ତୁ</p>\n<p>3) sudo dpkg -i <filename> ରନ୍ କରନ୍ତୁ</p>\n<p>ଏହି command ସଫଳତାର ସହ ରନ୍ କରିବା ପରେ, ଆପ୍ଲିକେସନ୍ ଲଞ୍ଚ୍ ହେବ </p>"
+    },
+    {
+      "topic": "ମୁଁ SUNBIRD ରେ ପଂଜୀକରଣ କରିବାକୁ ଚାହୁଁଛି ",
+      "description": "SUNBIRD ରେ ସାଇନ୍ ଅପ୍ କରିବା ପାଇଁ:\n<ul>\n<li>ଏଠାକୁ ଯାଆନ୍ତୁ: <a href =\"https://staging.sunbirded.org/explore\"target=\"_blank\"> SUNBIRD ଏକ୍ସପ୍ଲୋର୍ କରନ୍ତୁ </a> </li>\n<li>ଆପଣ ଜଣେ ଶିକ୍ଷକ କିମ୍ବା ଛାତ୍ର ତାହା ଚୟନ କରନ୍ତୁ</li>\n<li>ଆପଣଙ୍କର ଅବସ୍ଥିତି ବା ଲୋକେସନ୍ ବିବରଣୀ ଅପଡେଟ୍ କରନ୍ତୁ</li>\n<li>ପ୍ରୋଫାଇଲ୍ ଆଇକନ୍ ରେ କ୍ଲିକ୍ କରନ୍ତୁ</li>\n<li><b>ଲଗ୍ ଇନ୍</b> ରେ କ୍ଲିକ୍ କରନ୍ତୁ</li>\n<li>ଲଗ୍ ଇନ୍ ସ୍କ୍ରୀନରେ <b>ଏଠାରେ ରେଜିଷ୍ଟର୍ କରନ୍ତୁ</b> ରେ କ୍ଲିକ୍ କରନ୍ତୁ</li>\n<li>ରେଜିଷ୍ଟର୍ କରିବା ସମ୍ପର୍କରେ ଅଧିକ ବିବରଣୀ ପାଇଁ ଦେଖନ୍ତୁ: https://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html</li>\n</ul>"
+    },
+    {
+      "topic": "ମୁଁ ପାସୱାର୍ଡ ଭୁଲିଯାଇଛି",
+      "description": "<p>ଆପଣଙ୍କର ପାସୱାର୍ଡ ରିସେଟ୍ କରିବା ପାଇଁ, ନିମ୍ନ ସୋପାନ ଅନୁସରଣ କରି ଆକାଉଣ୍ଟ ରିକଭର୍ କରନ୍ତୁ:</p>\n<li>କ୍ଲିକ୍ କରନ୍ତୁ: <strong>ପାସୱାର୍ଡ ଭୁଲିଯାଇଛି</strong></li>\n<li>SUNBIRD ରେ ରେଜିଷ୍ଟର କରିବା ସମୟରେ ଆପଣ ଦେଇଥିବା ଇମେଲ୍ ଆଇଡି କିମ୍ବା ମୋବାଇଲ ନମ୍ବର ଏବଂ ୟୁଜର ନେମ୍ ଦିଅନ୍ତୁ</li>\n<li><br></li>\n<li>ଆପଣ ରେଜିଷ୍ଟର୍ କରିଥିବା ଇମେଲ୍ ଆଇଡି କିମ୍ବା ମୋବାଇଲ ନମ୍ବରରେ ଏକ OTP ପାଇବେ</li>\n<li><br></li>\n<li>ପାସୱାର୍ଡ ରିସେଟ୍ କରି ଆକାଉଣ୍ଟ ରିକଭର୍ କରିବା ପାଇଁ ସେହି OTP ପ୍ରବେଶ କରାନ୍ତୁ</li>\n<li>ପାସୱାର୍ଡ ରିସେଟ୍ କରିବା ସମ୍ପର୍କରେ ଅଧିକ ବିବରଣୀ ପାଇଁ, ଏଠାକୁ ଯାଆନ୍ତୁ, <a href=\"https://staging.sunbirded.org/help/getting-started/recover-password/index.htmltarget=_blank\">ପାସୱାର୍ଡ ରିକଭର୍ କରନ୍ତୁ</a></li>\n</ul>\n"
+    },
+    {
+      "topic": "ମୋ ରାଜ୍ୟର ପୋର୍ଟାଲ ସାହାଯ୍ୟରେ ମୁଁ SUNBIRD ରେ ଲଗ୍ ଇନ୍ କରିବାକୁ ଚାହୁଁଛି ",
+      "description": "<p>ଆପଣଙ୍କ ରାଜ୍ୟର ପୋର୍ଟାଲ ମାଧ୍ୟମରେ SUNBIRD ରେ ଲଗ୍ ଇନ୍ କରିବା ପାଇଁ:</p>\n<ul>\n<li>ଏଠାକୁ ଯାଆନ୍ତୁ: <a href=\"https://staging.sunbirded.org/explore\">SUNBIRD କୁ ଏକ୍ସପ୍ଲୋର୍ କରନ୍ତୁ </a>&nbsp;</li>\n<li>ଚୟନ କରନ୍ତୁ କି ଆପଣ ଜଣେ <strong>ଶିକ୍ଷକ</strong></li>\n<li>ଆପଣଙ୍କର ଅବସ୍ଥିତି ବା ଲୋକେସନ୍ ଚୟନ କରନ୍ତୁ&nbsp;</li>\n<li> <strong>ପ୍ରୋଫାଇଲ୍</strong> ଆଇକନ୍ ଉପରେ କ୍ଲିକ୍ କରନ୍ତୁ</li>\n<li><strong>ଲଗ୍ ଇନ୍</strong> ରେ କ୍ଲିକ୍ କରନ୍ତୁ</li>\n<li><strong>ରାଜ୍ୟ ସିଷ୍ଟମରୁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ</strong> ଚୟନ କରନ୍ତୁ</li>\n<li>ଆପଣଙ୍କର ରାଜ୍ୟ ଚୟନ କରନ୍ତୁ</li>\n<li>ଆପଣଙ୍କର ରାଜ୍ୟ ପୋର୍ଟାଲକୁ ଆପଣ ରିଡାଇରେକ୍ଟ ହେବେ</li>\n<li><strong>ୟୁଜର୍ ନେମ୍</strong> ଏବଂ <strong>ପାସୱାର୍ଡ</strong> <strong>Login&nbsp;</strong> screen&nbsp; ରେ ପ୍ରବେଶ କରାନ୍ତୁ, ଯାହା ଆପଣଙ୍କର ରାଜ୍ୟ ଆପଣଙ୍କୁ ଦେଇଥିଲା </li>\n<li><strong>ସବମିଟ୍ କରନ୍ତୁ</strong> ରେ କ୍ଲିକ୍ କରନ୍ତୁ</li>\n<li>ରାଜ୍ୟ ପୋର୍ଟାଲ ମାଧ୍ୟମରେ ଲଗି ଇନ୍ କରିବା ସମ୍ପର୍କରେ ଅଧିକ ବିବରଣୀ ପାଇଁ ଦେଖନ୍ତୁ,&nbsp;<a href=\"https://staging.sunbirded.org/help/getting-started/login/#logging-in-with-state-system\">ସାଇନ୍ ଅପ୍</a></li>"
+    },
+    {
+      "topic": "ମୁଁ ମୋର ପ୍ରୋଫାଇଲ୍ ବିବରଣୀ ଏଡିଟ୍ କରିବାକୁ ଚାହୁଁଛି ",
+      "description": "ଆପଣ ନିଜ ପ୍ରୋଫାଇଲରେ ନିମ୍ନ ବିବରଣୀ ଏଡିଟ୍ କରିପାରିବେ:\n<ul>\n<li>ନାମ, ରାଜ୍ୟ ଓ ଜିଲ୍ଲା ପରି ବ୍ୟକ୍ତିଗତ ବିବରଣୀ</li>\n<li>ମୋବାଇଲ ନମ୍ବର ଓ ଇମେଲ ଆଡ୍ରେସ୍ ପରି ଯୋଗାଯୋଗ ବିବରଣୀ</li>\n<li>ବୋର୍ଡ, ମାଧ୍ୟମ, ବିଷୟ ଓ ଶ୍ରେଣୀ ପରି ଅନ୍ୟାନ୍ୟ ବିବରଣୀ</li>\nପ୍ରୋଫାଇଲ ବିବରଣୀ କିପରି ଏଡିଟ୍ କରିବେ ସେ ସମ୍ପର୍କରେ ଅଧିକ ସୂଚନା ପାଇଁ ଦେଖନ୍ତୁ: <a href=\"https://staging.sunbirded.org/help/getting-started/user-profile/index.html\"target=\"_blank\">ୟୁଜର୍ ପ୍ରୋଫାଇଲ</a>"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-pa.json b/utils/DesktopFAQ/faq-pa.json
index 23b6a878f..0f629689c 100644
--- a/utils/DesktopFAQ/faq-pa.json
+++ b/utils/DesktopFAQ/faq-pa.json
@@ -9,16 +9,16 @@
       "description": "ਤੁਸੀਂ ਯੂਟਿਊਬ ਕੰਟੇਂਟ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਹੋ ਸਕਦਾ ਹੈ। ਤੁਸੀਂ ਉਦੋਂ ਹੀ ਯੂਟਿਊਬ ਕੰਟੇਂਟ ਨੂੰ ਚਲਾ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੁਸੀਂ ਆਨਲਾਈਨ ਹੋ। ਕੰਪਿਊਟਰ ਨੂੰ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
     },
     {
-      "topic": "ਮੈਨੂੰ ਆਪਣੀ DIKSHA ਡੈਸਕਟਾਪ ਐਪ ਨੂੰ ਅਪਡੇਟ ਕਰਨ ਦੀ ਜ਼ਰੂਰਤ ਹੈ",
+      "topic": "ਮੈਨੂੰ ਆਪਣੀ SUNBIRD ਡੈਸਕਟਾਪ ਐਪ ਨੂੰ ਅਪਡੇਟ ਕਰਨ ਦੀ ਜ਼ਰੂਰਤ ਹੈ",
       "description": "ਆਪਣੇ ਕੰਪਿਊਟਰ ਨੂੰ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ ਅਤੇ ਨਵੀਨਤਮ ਐਪ ਸੰਸਕਰਣ ਲਈ https://staging.sunbirded.org/desktop/latest ਚੈੱਕ ਕਰੋ"
     },
     {
       "topic": "ਮੇਰੇ ਕੋਲ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਵਾਲੇ ਲੈਪਟਾਪ ਤੱਕ ਐਕਸੈਸ ਨਹੀਂ ਹੈ, ਪਰ ਮੈਂ ਡੈਸਕਟੌਪ ਐਪ 'ਤੇ ਕੰਟੇਂਟ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨਾ ਜਾਂ ਅਪਡੇਟ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹਾਂ",
-      "description": "ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਮੋਬਾਈਲ ਫ਼ੋਨ ਹੈ, DIKSHA ਮੋਬਾਈਲ ਐਪ ਨੂੰ ਗੂਗਲ ਪਲੇਸਟੋਰ ਤੋਂ ਡਾਊਨਲੋਡ ਕਰੋ।\nਐਪ ਵਿਚਲੇ ਕੰਟੇਂਟ ਲਈ ਬਰਾਊਜ਼ ਕਰੋ।\nDIKSHA ਲਾਇਬ੍ਰੇਰੀ ਤੋਂ ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕਰੋ।\nਇਸਨੂੰ ਪੈੱਨਡਰਾਈਵ ਜਾਂ SD ਕਾਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ ਅਤੇ ਇਸਨੂੰ DIKSHA ਐਪ 'ਤੇ ਅਪਲੋਡ ਕਰੋ।"
+      "description": "ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਮੋਬਾਈਲ ਫ਼ੋਨ ਹੈ, SUNBIRD ਮੋਬਾਈਲ ਐਪ ਨੂੰ ਗੂਗਲ ਪਲੇਸਟੋਰ ਤੋਂ ਡਾਊਨਲੋਡ ਕਰੋ।\nਐਪ ਵਿਚਲੇ ਕੰਟੇਂਟ ਲਈ ਬਰਾਊਜ਼ ਕਰੋ।\nSUNBIRD ਲਾਇਬ੍ਰੇਰੀ ਤੋਂ ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕਰੋ।\nਇਸਨੂੰ ਪੈੱਨਡਰਾਈਵ ਜਾਂ SD ਕਾਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ ਅਤੇ ਇਸਨੂੰ SUNBIRD ਐਪ 'ਤੇ ਅਪਲੋਡ ਕਰੋ।"
     },
     {
       "topic": "ਮੈਨੂੰ ਕਿਸੇ ਖ਼ਾਸ ਵਿਸ਼ੇ ਲਈ ਕੰਟੇਂਟ ਨਹੀਂ ਮਿਲਦੇ, ਜਾਂ ਅਢੁੱਕਵੇਂ ਕੰਟੇਂਟ ਮਿਲਦੇ ਹਨ",
-      "description": "ਕੰਟੇਂਟ ਦੀ ਭਾਲ ਕਰਨ ਲਈ DIKSHA ਦੀ ਆਨਲਾਈਨ ਲਾਇਬ੍ਰੇਰੀ ਨੂੰ ਬਰਾਊਜ਼ ਕਰੋ। ਜੇ ਇਹ ਅਜੇ ਵੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ, ਤਾਂ ਕੰਟੇਂਟ ਬਾਰੇ ਆਪਣੀ ਫੀਡਬੈਕ ਸਟੇਟ SCERT ਨੂੰ ਭੇਜੋ"
+      "description": "ਕੰਟੇਂਟ ਦੀ ਭਾਲ ਕਰਨ ਲਈ SUNBIRD ਦੀ ਆਨਲਾਈਨ ਲਾਇਬ੍ਰੇਰੀ ਨੂੰ ਬਰਾਊਜ਼ ਕਰੋ। ਜੇ ਇਹ ਅਜੇ ਵੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ, ਤਾਂ ਕੰਟੇਂਟ ਬਾਰੇ ਆਪਣੀ ਫੀਡਬੈਕ ਸਟੇਟ SCERT ਨੂੰ ਭੇਜੋ"
     },
     {
       "topic": "ਐਪ ਬਹੁਤ ਹੌਲੀ ਹੈ",
@@ -37,12 +37,28 @@
       "description": "ਕਾਪੀ ਕਰਨ ਲਈ ਲਿਆ ਗਿਆ ਸਮਾਂ ਕੰਟੇਂਟ ਫਾਈਲ ਦੇ ਅਕਾਰ 'ਤੇ ਨਿਰਭਰ ਕਰਦਾ ਹੈ। ਕੁਝ ਵੱਡੀਆਂ ਪਾਠ-ਪੁਸਤਕਾਂ ਦੀ ਨਕਲ ਕਰਨ ਲਈ ਸਮਾਂ ਲੱਗਦਾ ਹੈ। ਅਸੀਂ ਤੁਹਾਨੂੰ ਸਿਫਾਰਸ਼ ਕਰਦੇ ਹਾਂ ਕਿ ਤੁਸੀਂ ਪ੍ਰਕਿਰਿਆ ਨੂੰ ਵਿਚਕਾਰ ਨਾ ਰੋਕੋ। ਅਜਿਹਾ ਕਰਨ ਨਾਲ ਅਸੰਗਤ ਫਾਈਲਾਂ ਲੱਗ ਸਕਦੀਆਂ ਹਨ।"
     },
     {
-      "topic": "ਮੇਰੇ ਕੰਪਿਊਟਰ ਵਿੱਚ DIKSHA ਕੰਟੇਂਟ ਕਾਰਨ ਕੋਈ ਖ਼ਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ",
+      "topic": "ਮੇਰੇ ਕੰਪਿਊਟਰ ਵਿੱਚ SUNBIRD ਕੰਟੇਂਟ ਕਾਰਨ ਕੋਈ ਖ਼ਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ",
       "description": "ਆਪਣੇ ਕੰਪਿਊਟਰ 'ਤੇ ਜਗ੍ਹਾ ਖ਼ਾਲੀ ਕਰਨ ਲਈ ਐਪ ਦੀ ਮਾਈ ਡਾਊਨਲੋਡਸ ਟੈਬ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੇ ਕੰਟੇਂਟ ਨੂੰ ਡੀਲੀਟ ਕਰੋ"
     },
     {
-      "topic": "ਮੇਰੇ ਉਬੰਤੂ ਸਿਸਟਮ 'ਤੇ DIKSHA ਡੈਸਕਟਾਪ ਐਪਲੀਕੇਸ਼ਨ ਸਥਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ",
-      "description": "<p>ਆਪਣੇ ਉਬੰਤੂ ਸਿਸਟਮ 'ਤੇ DIKSHA ਡੈਸਕਟਾਪ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਸਥਾਪਤ ਕਰਨ ਲਈ:</p>\n<p>1) ਆਪਣਾ ਟਰਮੀਨਲ ਖੋਲ੍ਹੋ</p>\n<p>2) ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਲਈ ਸੀਡੀ <ਲੋਕੇਸ਼ਨ> ਕਮਾਂਡ ਚਲਾਓ, ਜਿੱਥੇ exe ਫਾਈਲ ਡਾਊਨਲੋਡ ਕੀਤੀ ਗਈ ਹੈ। ਉਦਾਹਰਣ ਲਈ, ਜੇ exe ਨੂੰ ਡਾਊਨਲੋਡਸ ਫੋਲਡਰ ਵਿੱਚ ਸੇਵ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ ਸੀਡੀ ਡਾਊਨਲੋਡਸ ਕਮਾਂਡ ਚਲਾਓ</p>\n<p>3) sudo dpkg -i <ਫਾਈਲ ਦਾ ਨਾਮ>ਕਮਾਂਡ ਚਲਾਓ </p>\n<p>ਇਸ ਕਮਾਂਡ ਨੂੰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਚਲਾਉਣ 'ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਲਾਂਚ ਹੋ ਜਾਂਦੀ ਹੈ </p>"
+      "topic": "ਮੇਰੇ ਉਬੰਤੂ ਸਿਸਟਮ 'ਤੇ SUNBIRD ਡੈਸਕਟਾਪ ਐਪਲੀਕੇਸ਼ਨ ਸਥਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ",
+      "description": "<p>ਆਪਣੇ ਉਬੰਤੂ ਸਿਸਟਮ 'ਤੇ SUNBIRD ਡੈਸਕਟਾਪ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਸਥਾਪਤ ਕਰਨ ਲਈ:</p>\n<p>1) ਆਪਣਾ ਟਰਮੀਨਲ ਖੋਲ੍ਹੋ</p>\n<p>2) ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਲਈ ਸੀਡੀ <ਲੋਕੇਸ਼ਨ> ਕਮਾਂਡ ਚਲਾਓ, ਜਿੱਥੇ exe ਫਾਈਲ ਡਾਊਨਲੋਡ ਕੀਤੀ ਗਈ ਹੈ। ਉਦਾਹਰਣ ਲਈ, ਜੇ exe ਨੂੰ ਡਾਊਨਲੋਡਸ ਫੋਲਡਰ ਵਿੱਚ ਸੇਵ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ ਸੀਡੀ ਡਾਊਨਲੋਡਸ ਕਮਾਂਡ ਚਲਾਓ</p>\n<p>3) sudo dpkg -i <ਫਾਈਲ ਦਾ ਨਾਮ>ਕਮਾਂਡ ਚਲਾਓ </p>\n<p>ਇਸ ਕਮਾਂਡ ਨੂੰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਚਲਾਉਣ 'ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਲਾਂਚ ਹੋ ਜਾਂਦੀ ਹੈ </p>"
+    },
+    {
+      "topic": "ਮੈਂ SUNBIRD 'ਤੇ ਰਜਿਸਟਰ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹਾਂ",
+      "description": "SUNBIRD 'ਤੇ ਸਾਈਨ ਅਪ ਕਰਨ ਲਈ:\n<ul>\n     <li> <a href =\"https://staging.sunbirded.org/explore\"target=\"_blank\">SUNBIRD 'ਤੇ ਪੜਚੋਲ ਕਰੋ </a> 'ਤੇ ਜਾਓ </li>\n<li>ਚੁਣੋ ਕਿ ਤੁਸੀਂ ਅਧਿਆਪਕ ਹੋ ਜਾਂ ਵਿਦਿਆਰਥੀ</li>\n<li>ਆਪਣੇ ਸਥਾਨ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਅਪਡੇਟ ਕਰੋ</li>\n<li>ਪ੍ਰੋਫਾਈਲ ਆਈਕਾਨ 'ਤੇ ਕਲਿੱਕ ਕਰੋ</li>\n<li> <b> ਲੌਗਿਨ </ b>'ਤੇ ਕਲਿਕ ਕਰੋ </li>\n<li> ਲੌਗਿਨ ਸਕ੍ਰੀਨ 'ਤੇ <b> ਇੱਥੇ ਰਜਿਸਟਰ ਕਰੋ </ b> 'ਤੇ ਕਲਿਕ ਕਰੋ </li>\n<li> ਰਜਿਸਟਰ ਕਿਵੇਂ ਕਰੀਏ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲਈ https://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html </li>\n</ul>"
+    },
+    {
+      "topic": "ਮੈਂ ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਗਿਆ ਹਾਂ",
+      "description": "<p>ਆਪਣਾ ਪਾਸਵਰਡ ਰੀਸੈਟ ਕਰਨ ਲਈ, ਇਨ੍ਹਾਂ ਕਦਮਾਂ ਦੀ ਪਾਲਣਾ ਕਰੋ ਅਤੇ ਆਪਣੇ ਖਾਤੇ ਨੂੰ ਮੁੜ ਪ੍ਰਾਪਤ ਕਰੋ: </p>\n<ul>\n<li> <strong> ਪਾਸਵਰਡ ਭੁੱਲ ਗਏ </strong>'ਤੇ ਕਲਿਕ ਕਰੋ</li>\n<li>ਉਹ ਈਮੇਲ ਪਤਾ ਜਾਂ ਮੋਬਾਈਲ ਨੰਬਰ ਅਤੇ ਉਪਭੋਗਤਾ ਦਾ ਨਾਮ ਦਰਜ ਕਰੋ ਜੋ ਤੁਸੀਂ SUNBIRD 'ਤੇ ਰਜਿਸਟਰ ਕਰਨ ਵੇਲੇ ਪ੍ਰਦਾਨ ਕੀਤਾ ਸੀ</li>\n<li><br></li>\n<li>ਤੁਸੀਂ ਆਪਣੀ ਰਜਿਸਟਰਡ ਈਮੇਲ ਜਾਂ ਮੋਬਾਈਲ ਨੰਬਰ 'ਤੇ ਇਕ OTP ਪ੍ਰਾਪਤ ਕਰੋਗੇ</li>\n<li><br></li>\n<li>ਆਪਣਾ ਪਾਸਵਰਡ ਰੀਸੈਟ ਕਰਨ ਅਤੇ ਆਪਣੇ ਖਾਤੇ ਨੂੰ ਮੁੜ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ OTP ਦਰਜ ਕਰੋ</li>\n<li>ਆਪਣੇ ਪਾਸਵਰਡ ਨੂੰ ਰੀਸੈਟ ਕਰਨ ਲਈ ਵੇਰਵਿਆਂ ਲਈ, ਵੇਖੋ <a href=\"https://staging.sunbirded.org/help/getting-started/recover-password/index.htmltarget=_blank\">ਪਾਸਵਰਡ ਮੁੜ ਪ੍ਰਾਪਤ ਕਰੋ</a></li>"
+    },
+    {
+      "topic": "ਮੈਂ ਆਪਣੇ ਰਾਜ ਪੋਰਟਲ ਦੁਆਰਾ SUNBIRD 'ਤੇ ਲੌਗਇਨ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹਾਂ",
+      "description": "<p>ਆਪਣੇ ਸਟੇਟ ਪੋਰਟਲ ਰਾਹੀਂ SUNBIRD ਵਿੱਚ ਲੌਗਇਨ ਕਰਨ ਲਈ:</p>\n<ul>\n<li> <a href=\"https://staging.sunbirded.org/explore\"> SUNBIRD ਦੀ ਪੜਚੋਲ ਕਰੋ 'ਤੇ ਜਾਓ</a>&nbsp;</li>\n<li>ਚੁਣੋ ਕਿ ਤੁਸੀਂ ਇੱਕ <strong> ਅਧਿਆਪਕ </strong> </li>ਹੋ\n<li>ਆਪਣਾ ਟਿਕਾਣਾ&nbsp; ਚੁਣੋ</li>\n<li><strong>ਪ੍ਰੋਫਾਈਲ</strong> ਆਈਕਾਨ 'ਤੇ ਕਲਿਕ ਕਰੋ</li>\n<li><strong>ਲੌਗਇਨ</ strong> 'ਤੇ ਕਲਿਕ ਕਰੋ</li>\n<li><strong>ਸਟੇਟ ਸਿਸਟਮ ਨਾਲ ਲੌਗਇਨ ਕਰੋ</ strong> ਦੀ ਚੋਣ ਕਰੋ</li>\n<li>ਆਪਣੇ ਰਾਜ ਦੀ ਚੋਣ ਕਰੋ</li>\n<li>ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਸਟੇਟ ਪੋਰਟਲ 'ਤੇ ਭੇਜਿਆ ਜਾਵੇਗਾ</li>\n<li>ਤੁਹਾਡੇ ਰਾਜ ਦੁਆਰਾ ਤੁਹਾਨੂੰ ਦਿੱਤਾ ਗਿਆ<strong> ਉਪਭੋਗਤਾ ਨਾਮ</strong> ਅਤੇ <strong> ਪਾਸਵਰਡ </strong> <strong> ਲੌਗਇਨ&nbsp;</strong> ਸਕ੍ਰੀਨ&nbsp; ਵਿੱਚ ਦਾਖਲ ਕਰੋ </li>\n<li><strong>ਜਮ੍ਹਾਂ ਕਰੋ</strong> 'ਤੇ ਕਲਿਕ ਕਰੋ</li>\n<li>ਸਟੇਟ ਪੋਰਟਲ ਰਾਹੀਂ ਲੌਗਇਨ ਕਰਨ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲਈ, ਵੇਖੋ&nbsp;<a href=\"https://staging.sunbirded.org/help/getting-started/login/#logging-in-with-state-system\">ਸਾਇਨ ਅਪ</a></li>\n</ul>"
+    },
+    {
+      "topic": "ਮੈਂ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਵੇਰਵਿਆਂ ਦੀ ਸੋਧ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹਾਂ",
+      "description": "ਤੁਸੀਂ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਵਿਚ ਹੇਠ ਦਿੱਤੇ ਵੇਰਵਿਆਂ ਨੂੰ ਸੋਧ ਸਕਦੇ ਹੋ:\n<ul>\n<li>ਨਿੱਜੀ ਵੇਰਵੇ ਜਿਵੇਂ ਨਾਮ, ਰਾਜ ਅਤੇ ਜ਼ਿਲ੍ਹਾ</li>\n<li>ਸੰਪਰਕ ਵੇਰਵੇ ਜਿਵੇਂ ਮੋਬਾਈਲ ਨੰਬਰ ਅਤੇ ਈਮੇਲ ਪਤਾ</li>\n<li>ਹੋਰ ਵੇਰਵੇ ਜਿਵੇਂ ਬੋਰਡ, ਮਾਧਿਅਮ, ਵਿਸ਼ਾ, ਅਤੇ ਕਲਾਸ</li>\nਪ੍ਰੋਫਾਈਲ ਵੇਰਵਿਆਂ ਵਿੱਚ ਕਿਵੇਂ ਸੋਧ ਕਰਨੀ ਹੈ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲਈ, ਵੇਖੋ\n<a href=\"https://staging.sunbirded.org/help/getting-started/user-profile/index.html\"target=\"_blank\">User profile</a>"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-ta.json b/utils/DesktopFAQ/faq-ta.json
index 73ac9b753..95e4dd74a 100644
--- a/utils/DesktopFAQ/faq-ta.json
+++ b/utils/DesktopFAQ/faq-ta.json
@@ -9,20 +9,20 @@
       "description": "நீங்கள் YouTube உள்ளடக்கத்தை பதிவிறக்கம் செய்திருக்கலாம். நீங்கள் ஆன்லைனில் இருக்கும்போது மட்டுமே YouTube உள்ளடக்கத்தை இயக்க முடியும். கணினியை இணையத்துடன் இணைக்க மீண்டும் முயற்சிக்கவும்."
     },
     {
-      "topic": "எனது DIKSHA டெஸ்க்டாப் செயலியை புதுப்பிக்க வேண்டும்",
+      "topic": "எனது SUNBIRD டெஸ்க்டாப் செயலியை  புதுப்பிக்க வேண்டும்",
       "description": "உங்கள் கணினியை இணையத்துடன் இணைத்து, சமீபத்திய பயன்பாட்டு பதிப்பிற்காக https://staging.sunbirded.org/desktop/latest க்கு செல்லவும் "
     },
     {
       "topic": "இணைய இணைப்புடன் மடிக்கணினிக்கு அணுகல் இல்லை, ஆனால் டெஸ்க்டாப் செயலியில் உள்ளடக்கத்தை சேர்க்க அல்லது புதுப்பிக்க விரும்புகிறேன்",
-      "description": "உங்களிடம் கைப்பேசி இருந்தால், கூகிள் பிளேஸ்டோரிலிருந்து DIKSHA மொபைல் செயலியை பதிவிறக்கவும். செயலியில் உள்ள உள்ளடக்கத்திற்காக உலாவுக. DIKSHA நூலகத்திலிருந்து உள்ளடக்கத்தைப் பதிவிறக்கவும். பென்ட்ரைவ் அல்லது எஸ்டி கார்டில் நகலெடுத்து அதை DIKSHA டெஸ்க்டாப் செயலியில் பதிவேற்றவும்."
+      "description": "உங்களிடம் கைப்பேசி இருந்தால், கூகிள் பிளேஸ்டோரிலிருந்து SUNBIRD மொபைல் செயலியை பதிவிறக்கவும். செயலியில் உள்ள உள்ளடக்கத்திற்காக உலாவுக. SUNBIRD நூலகத்திலிருந்து உள்ளடக்கத்தைப் பதிவிறக்கவும். பென்ட்ரைவ் அல்லது எஸ்டி கார்டில் நகலெடுத்து அதை SUNBIRD டெஸ்க்டாப் செயலியில் பதிவேற்றவும்."
     },
     {
-      "topic": "ஒரு குறிப்பிட்ட தலைப்புக்கான உள்ளடக்கம் கிடைக்கவில்லை, அல்லது பொருத்தமற்ற உள்ளடக்கத்தைக் காண்கிறேன்",
-      "description": "உள்ளடக்கத்தைத் தேட DIKSHA இன் ஆன்லைன் நூலகத்தை உலாவுக. இது இன்னும் கிடைக்கவில்லை என்றால், உள்ளடக்கத்தைப் பற்றிய உங்கள் கருத்தை மாநில SCERT க்கு அனுப்புங்கள்"
+      "topic": "ஒரு குறிப்பிட்ட தலைப்புக்கான உள்ளடக்கம்  கிடைக்கவில்லை, அல்லது பொருத்தமற்ற உள்ளடக்கத்தைக்  காண்கிறேன்",
+      "description": "உள்ளடக்கத்தைத் தேட SUNBIRD இன் ஆன்லைன் நூலகத்தை உலாவுக. இது இன்னும் கிடைக்கவில்லை என்றால், உள்ளடக்கத்தைப் பற்றிய உங்கள் கருத்தை மாநில SCERT க்கு அனுப்புங்கள்"
     },
     {
       "topic": "பயன்பாடு மிகவும் மெதுவாக உள்ளது",
-      "description": "செயலியின் செயல்திறனை விரைவுபடுத்த, பின்வருவனவற்றைச் செய்யுங்கள்: <br> உங்கள் கணினியின் கணினி உள்ளமைவுக்குச் செல்லவும். குறைந்தபட்ச உள்ளமைவு இருக்க வேண்டும்: <ul> <li> 2 ஜிபி ரேம் </li> <li> இரட்டை கோர் செயலி </li> </ul> <br> உங்கள் கணினி இந்த உள்ளமைவுடன் பொருந்தினால் அல்லது மீறினால், பயன்பாட்டை மறுதொடக்கம் செய்யுங்கள். <br> இதைச் செய்தபின், அது இன்னும் மெதுவாக இருந்தால், <b> பணி நிர்வாகி </b> க்குச் சென்று, பயன்படுத்தப்படாத அனைத்து பின்னணி செயல்முறைகளையும் தேர்ந்தெடுத்து <b> பணியை முடிக்க </b> என்பதைக் கிளிக் செய்க"
+      "description": "செயலியின்  செயல்திறனை விரைவுபடுத்த, பின்வருவனவற்றைச் செய்யுங்கள்: <br> உங்கள் கணினியின் கணினி உள்ளமைவுக்குச் செல்லவும். குறைந்தபட்ச உள்ளமைவு இருக்க வேண்டும்: <ul> <li> 2 ஜிபி ரேம் </li> <li> இரட்டை கோர் செயலி </li> </ul> <br> உங்கள் கணினி இந்த உள்ளமைவுடன் பொருந்தினால் அல்லது மீறினால், பயன்பாட்டை மறுதொடக்கம் செய்யுங்கள். <br> இதைச் செய்தபின், அது இன்னும் மெதுவாக இருந்தால், <b> பணி நிர்வாகி </b> க்குச் சென்று, பயன்படுத்தப்படாத அனைத்து பின்னணி செயல்முறைகளையும் தேர்ந்தெடுத்து <b> பணியை முடிக்க </b> என்பதைக் கிளிக் செய்க"
     },
     {
       "topic": "பென்ட்ரைவிற்கு உள்ளடக்கத்தை நகலெடுக்க என்னால் முடியவில்லை",
@@ -37,12 +37,28 @@
       "description": "நகலெடுக்க எடுக்கப்பட்ட நேரம் உள்ளடக்கக் கோப்பின் அளவைப் பொறுத்தது. சில பெரிய பாடப்புத்தகங்கள் நகலெடுக்க நேரம் எடுக்கும். இடையில் செயல்பாட்டை நிறுத்த வேண்டாம் என்று நாங்கள் பரிந்துரைக்கிறோம். அவ்வாறு செய்வது சீரற்ற கோப்புகளுக்கு வழிவகுக்கும்."
     },
     {
-      "topic": "DIKSHA உள்ளடக்கம் காரணமாக எனது கணினியில் இடம் இல்லை",
+      "topic": "SUNBIRD உள்ளடக்கம் காரணமாக எனது கணினியில்  இடம் இல்லை",
       "description": "உங்கள் கணினியில் இடத்தை விடுவிக்க பயன்பாட்டின் எனது பதிவிறக்கங்கள் தாவலில் இருந்து பதிவிறக்கம் செய்யப்பட்ட உள்ளடக்கத்தை நீக்கு"
     },
     {
-      "topic": "எனது உபுண்டு கணினியில் DIKSHA டெஸ்க்டாப் செயலியை நிறுவ முடியவில்லை",
-      "description": "<p> உங்கள் உபுண்டு கணினியில் DIKSHA டெஸ்க்டாப் செயலியை நிறுவ: </ p> <p> 1) உங்கள் டெர்மினல் திறக்கவும் </p> <p> 2) கோப்பகத்தை exe கோப்பு இருக்கும் இடத்திற்கு மாற்ற cd <location> கட்டளையை இயக்கவும் பதிவிறக்கம் செய்யப்பட்டது. எடுத்துக்காட்டாக, பதிவிறக்க கோப்புறையில் exe சேமிக்கப்பட்டால், cd பதிவிறக்கங்கள் </p> <p> 3) கட்டளையை இயக்கவும் sudo dpkg -i <filename> </p> <p> இந்த கட்டளையை வெற்றிகரமாக இயக்கும் போது பயன்பாடு தொடங்கப்பட்டது </p>"
+      "topic": "எனது உபுண்டு கணினியில் SUNBIRD டெஸ்க்டாப் செயலியை  நிறுவ முடியவில்லை",
+      "description": "<p> உங்கள் உபுண்டு கணினியில் SUNBIRD டெஸ்க்டாப் செயலியை நிறுவ: </ p> <p> 1) உங்கள் டெர்மினல் திறக்கவும் </p> <p> 2) கோப்பகத்தை exe கோப்பு இருக்கும் இடத்திற்கு மாற்ற cd <location> கட்டளையை இயக்கவும் பதிவிறக்கம் செய்யப்பட்டது. எடுத்துக்காட்டாக, பதிவிறக்க கோப்புறையில் exe சேமிக்கப்பட்டால், cd பதிவிறக்கங்கள் </p> <p> 3) கட்டளையை இயக்கவும் sudo dpkg -i <filename> </p> <p> இந்த கட்டளையை வெற்றிகரமாக இயக்கும் போது பயன்பாடு தொடங்கப்பட்டது </p>"
+    },
+    {
+      "topic": "நான் திரிஷாவில் பதிவு செய்ய விரும்புகிறேன்",
+      "description": "தீக்‌ஷா இல் பதிவுபெற:\n<ul><li>செல்லுங்கள்<a href =\"https://staging.sunbirded.org/explore\"target=\"_blank\">தீக்‌ஷாவை உலாவு </a> </li>\n<li>நீங்கள் ஆசிரியரா அல்லது மாணவரா என்பதைத் தேர்ந்தெடுக்கவும்</li>\n<li>உங்கள் இருப்பிட விவரங்களைப் புதுப்பிக்கவும்</li>\n<li>சுயவிவர படத்தைக்  கிளிக் செய்க</li>\n<li>கிளிக் செய்க<b>உள்நுழைய</b></li>\n<li>Click <b>இங்கே பதிவு செய்யுங்கள்</b> உள்நுழைவு திரையில்</li>\n<li>பதிவு செய்வது எப்படி என்பது குறித்த விவரங்களுக்கு பார்க்கவும்https://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html</li>\n</ul>"
+    },
+    {
+      "topic": "என் கடவு சொல்லை மறந்து விட்டேன்",
+      "description": "<p>உங்கள் கடவுச்சொல்லை மீட்டமைக்க, இந்த வழிமுறைகளைப் பின்பற்றி உங்கள் கணக்கை மீட்டெடுக்கவும்:</p>\n<ul>\n<li>கிளிக் செய்க <strong>கடவுச்சொல்லை மறந்துவிட்டேன்</strong></li>\n<li>தீக்‌ஷாவில் பதிவு செய்யும் போது நீங்கள் வழங்கிய மின்னஞ்சல் முகவரி அல்லது கைப்பேசி  எண் மற்றும் பயனர் பெயரை உள்ளிடவும்</li>\n<li><br></li>\n<li>உங்கள் பதிவு செய்யப்பட்ட மின்னஞ்சல் அல்லது  கைப்பேசிஎண்ணில் OTP ஐப் பெறுவீர்கள்</li>\n <li><br></li>\n<li>உங்கள் கடவுச்சொல்லை மீட்டமைக்க OTP ஐ உள்ளிட்டு உங்கள் கணக்கை மீட்டெடுக்கவும்</li>\n<li>உங்கள் கடவுச்சொல்லை மீட்டமைக்க விவரங்களுக்கு, பார்க்கவும் <a href=\"https://staging.sunbirded.org/help/getting-started/recover-password/index.htmltarget=_blank\">கடவுச்சொல்லை மீட்டெடுக்கவும்</a></li>\n</ul>"
+    },
+    {
+      "topic": "எனது மாநில போர்ட்டல் மூலம் தீக்ஷாவில் உள்நுழைய விரும்புகிறேன்",
+      "description": "<p>உங்கள் மாநில போர்ட்டல் மூலம் தீக்ஷாவில் உள்நுழைய:</p>\n<ul>\n<li>இங்கே செல்லுங்கள் <a href=\"https://staging.sunbirded.org/explore\">Explore SUNBIRD</a>&nbsp;</li>\n<li>நீங்கள் யார் என்பதைத் தேர்ந்தெடுக்கவும்<strong>ஆசிரியர்</strong></li>\n<li>உங்கள் இருப்பிடம் மற்றும் nbspஐ  தேர்ந்தெடுக்கவும் ;</li>\n<li>கிளிக் செய்யவும் <strong>சுயவிவர</strong>உருவத்தை</li>\n<li>கிளிக் செய்யவும் <strong>உள்நுழைய</strong></li>\n<li>தேர்ந்தெடுங்கள் <strong>மாநில அமைப்புடன் உள்நுழைக</strong></li>\n<li>உங்கள் மாநிலத்தைத் தேர்ந்தெடுக்கவும்</li>\n<li>உங்கள் மாநில போர்ட்டலுக்கு நீங்கள் திருப்பி விடப்படுவீர்கள்</li>\n<li>Enter the <strong>User name</strong> மற்றும்<strong>கடவுச்சொல்</strong>உங்கள் மாநிலத்தால் உங்களுக்கு வழங்கப்பட்டதை <strong>உள்நுழை &nbsp;</strong>திரை &nbsp;</li>\n<li>கிளிக் செய்க<strong>சமர்ப்பிக்கவும்</strong></li>\n<li>மாநில போர்ட்டல் மூலம் உள்நுழைய, விவரங்களை பார்க்கவும் &nbsp;<a href=\"https://staging.sunbirded.org/help/getting-started/login/#logging-in-with-state-system\">பதிவு பெறுக</a></li>\n</ul>\n"
+    },
+    {
+      "topic": "எனது சுயவிவர விவரங்களைத் திருத்த விரும்புகிறேன்",
+      "description": "உங்கள் சுயவிவரத்தில் பின்வரும் விவரங்களைத் திருத்தலாம்: \n<ul>\n <li> பெயர், மாநிலம் மற்றும் மாவட்டம் போன்ற தனிப்பட்ட விவரங்கள் </ li>\n <li> மொபைல் எண் மற்றும் மின்னஞ்சல் முகவரி போன்ற தொடர்பு விவரங்கள் </ li> \n<li> வாரியம், மொழிவழி கல்வி, பொருள் மற்றும் வகுப்பு போன்ற பிற விவரங்கள்</li>\nசுயவிவர விவரங்களை எவ்வாறு திருத்துவது என்பது குறித்த விவரங்களுக்கு, பாருங்கள்<a href = \"https://staging.sunbirded.org/help/getting-started/user-profile /index.html\"target=\"_blank\"> பயனர் சுயவிவரம் </a>"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-te.json b/utils/DesktopFAQ/faq-te.json
index dc7b45332..cc4aa49bb 100644
--- a/utils/DesktopFAQ/faq-te.json
+++ b/utils/DesktopFAQ/faq-te.json
@@ -2,47 +2,63 @@
   "faqs": [
     {
       "topic": "నా బోర్డు, మీడియం, క్లాస్ మరియు సబ్జెక్టును నేను చూడలేను",
-      "description": "మీ రాష్ట్రం ప్రస్తుతం అన్ని బోర్డులు, మాధ్యమాలు, తరగతులు మరియు విషయాలకు మద్దతు ఇవ్వదు. మీ రాష్ట్రం వాటిని జోడించిన వెంటనే, మీరు దానిని జాబితాలో చూస్తారు"
+      "description": "మీ రాష్ట్రం ప్రస్తుతం అన్ని బోర్డులు, మాధ్యమాలు, తరగతులు మరియు విషయాలకు మద్దతు ఇవ్వదు.  మీ రాష్ట్రం వాటిని జోడించిన వెంటనే, మీరు దానిని జాబితాలో చూస్తారు"
     },
     {
       "topic": "నేను కంటెంట్‌ను డౌన్‌లోడ్ చేసాను, కాని నేను దీన్ని ప్లే చేయలేకపోతున్నాను ఎందుకంటే నాకు ఇంటర్నెట్ అవసరం అని చెప్పింది",
-      "description": "మీరు యూట్యూబ్ కంటెంట్‌ను డౌన్‌లోడ్ చేసి ఉండవచ్చు. మీరు ఆన్‌లైన్‌లో ఉన్నప్పుడు మాత్రమే మీరు యూట్యూబ్ కంటెంట్‌ను ప్లే చేయవచ్చు. కంప్యూటర్‌ను ఇంటర్నెట్‌కు కనెక్ట్ చేయండి మళ్లీ ప్రయత్నించండి."
+      "description": "మీరు యూట్యూబ్ కంటెంట్‌ను డౌన్‌లోడ్ చేసి ఉండవచ్చు.  మీరు ఆన్‌లైన్‌లో ఉన్నప్పుడు మాత్రమే మీరు యూట్యూబ్ కంటెంట్‌ను ప్లే చేయవచ్చు.  కంప్యూటర్‌ను ఇంటర్నెట్‌కు కనెక్ట్ చేయండి మళ్లీ ప్రయత్నించండి."
     },
     {
-      "topic": "నేను నా DIKSHA డెస్క్‌టాప్ అనువర్తనాన్ని నవీకరించాలి",
+      "topic": "నేను నా SUNBIRD డెస్క్‌టాప్ అనువర్తనాన్ని నవీకరించాలి",
       "description": "మీ కంప్యూటర్‌ను ఇంటర్నెట్‌కు కనెక్ట్ చేయండి మరియు తాజా అనువర్తన సంస్కరణ కోసం https://staging.sunbirded.org/desktop/latest ని తనిఖీ చేయండి"
     },
     {
       "topic": "నాకు ఇంటర్నెట్ కనెక్షన్ ఉన్న ల్యాప్‌టాప్‌కు ప్రాప్యత లేదు, కానీ నేను డెస్క్‌టాప్ అనువర్తనంలో కంటెంట్‌ను జోడించాలనుకుంటున్నాను లేదా నవీకరించాలనుకుంటున్నాను",
-      "description": "మీకు మొబైల్ ఫోన్ ఉంటే, గూగుల్ ప్లేస్టోర్ నుండి DIKSHA మొబైల్ అనువర్తనాన్ని డౌన్‌లోడ్ చేయండి.\n అనువర్తనంలోని కంటెంట్ కోసం బ్రౌజ్ చేయండి.\n DIKSHA లైబ్రరీ నుండి కంటెంట్‌ను డౌన్‌లోడ్ చేయండి.\n దీన్ని పెన్‌డ్రైవ్ లేదా SD కార్డ్‌లో కాపీ చేసి, DIKSHA డెస్క్‌టాప్ అనువర్తనానికి అప్‌లోడ్ చేయండి."
+      "description": "మీకు మొబైల్ ఫోన్ ఉంటే, గూగుల్ ప్లేస్టోర్ నుండి SUNBIRD మొబైల్ అనువర్తనాన్ని డౌన్‌లోడ్ చేయండి.\n అనువర్తనంలోని కంటెంట్ కోసం బ్రౌజ్ చేయండి.\n SUNBIRD లైబ్రరీ నుండి కంటెంట్‌ను డౌన్‌లోడ్ చేయండి.\n దీన్ని పెన్‌డ్రైవ్ లేదా SD కార్డ్‌లో కాపీ చేసి, SUNBIRD డెస్క్‌టాప్ అనువర్తనానికి అప్‌లోడ్ చేయండి."
     },
     {
       "topic": "నేను ఒక నిర్దిష్ట అంశం కోసం కంటెంట్‌ను కనుగొనలేదు, లేదా కంటెంట్ అసంబద్ధం అని నేను భావిస్తున్నాను",
-      "description": "కంటెంట్ కోసం శోధించడానికి DIKSHA యొక్క ఆన్‌లైన్ లైబ్రరీని బ్రౌజ్ చేయండి. ఇది ఇప్పటికీ అందుబాటులో లేకపోతే, కంటెంట్ గురించి మీ అభిప్రాయాన్ని స్టేట్ SCERT కి పంపండి"
+      "description": "కంటెంట్ కోసం శోధించడానికి SUNBIRD యొక్క ఆన్‌లైన్ లైబ్రరీని బ్రౌజ్ చేయండి.  ఇది ఇప్పటికీ అందుబాటులో లేకపోతే, కంటెంట్ గురించి మీ అభిప్రాయాన్ని స్టేట్ SCERT కి పంపండి"
     },
     {
       "topic": "అనువర్తనం చాలా నెమ్మదిగా ఉంది",
-      "description": "అనువర్తన పనితీరును వేగవంతం చేయడానికి, కింది వాటిని చేయండి:\n <br> మీ కంప్యూటర్ సిస్టమ్ కాన్ఫిగరేషన్‌కు వెళ్లండి. కనీస కాన్ఫిగరేషన్ ఉండాలి:\n <ul> <li> 2 GB RAM </li>\n <li> ద్వంద్వ కోర్ ప్రాసెసర్ </ li> </ul>\n <br> మీ కంప్యూటర్ ఈ కాన్ఫిగరేషన్‌తో సరిపోలితే లేదా మించి ఉంటే, అనువర్తనాన్ని మళ్ళీ ప్రారంభించండి.\n <br> దీన్ని చేసిన తర్వాత, అది ఇంకా నెమ్మదిగా ఉంటే, <b> టాస్క్ మేనేజర్ </b> కు వెళ్లండి,\n ఉపయోగించని అన్ని నేపథ్య ప్రక్రియలను ఎంచుకోండి మరియు <b> ఎండ్ టాస్క్ </b> క్లిక్ చేయండి"
+      "description": "అనువర్తన పనితీరును వేగవంతం చేయడానికి, కింది వాటిని చేయండి:\n <br> మీ కంప్యూటర్ సిస్టమ్ కాన్ఫిగరేషన్‌కు వెళ్లండి.  కనీస కాన్ఫిగరేషన్ ఉండాలి:\n <ul> <li> 2 GB RAM </li>\n <li> ద్వంద్వ కోర్ ప్రాసెసర్ </ li> </ul>\n <br> మీ కంప్యూటర్ ఈ కాన్ఫిగరేషన్‌తో సరిపోలితే లేదా మించి ఉంటే, అనువర్తనాన్ని మళ్ళీ ప్రారంభించండి.\n <br> దీన్ని చేసిన తర్వాత, అది ఇంకా నెమ్మదిగా ఉంటే, <b> టాస్క్ మేనేజర్ </b> కు వెళ్లండి,\n ఉపయోగించని అన్ని నేపథ్య ప్రక్రియలను ఎంచుకోండి మరియు <b> ఎండ్ టాస్క్ </b> క్లిక్ చేయండి"
     },
     {
       "topic": "నేను పెన్‌డ్రైవ్‌కు కంటెంట్‌ను కాపీ చేయలేకపోతున్నాను",
-      "description": "పెన్ డ్రైవ్‌కు కంటెంట్‌ను కాపీ చేయడానికి, కింది వాటిని చేయండి:\n <ul> <li> మీ కంప్యూటర్ సెట్టింగ్‌లకు వెళ్లండి. USB డ్రైవ్ వ్రాసే-రక్షించబడిందో లేదో తనిఖీ చేయండి. అది ఉంటే, రక్షణను నిలిపివేయండి </li> </li>\n <li> పెన్ డ్రైవ్‌లో ఖాళీ స్థలం ఉందో లేదో తనిఖీ చేయండి. పెన్‌డ్రైవ్ నుండి అవాంఛిత ఫైల్‌లను తొలగించండి </li> </ul>"
+      "description": "పెన్ డ్రైవ్‌కు కంటెంట్‌ను కాపీ చేయడానికి, కింది వాటిని చేయండి:\n <ul> <li> మీ కంప్యూటర్ సెట్టింగ్‌లకు వెళ్లండి.  USB డ్రైవ్ వ్రాసే-రక్షించబడిందో లేదో తనిఖీ చేయండి.  అది ఉంటే, రక్షణను నిలిపివేయండి </li> </li>\n <li> పెన్ డ్రైవ్‌లో ఖాళీ స్థలం ఉందో లేదో తనిఖీ చేయండి.  పెన్‌డ్రైవ్ నుండి అవాంఛిత ఫైల్‌లను తొలగించండి </li> </ul>"
     },
     {
       "topic": "నేను నా పెన్‌డ్రైవ్‌లో కంటెంట్‌ను లోడ్ చేసాను, కాని ఇప్పుడు అది ఖాళీగా ఉందని నేను చూశాను",
-      "description": "మీ పెన్‌డ్రైవ్ లేదా కంప్యూటర్ వైరస్ బారిన పడవచ్చు. దాన్ని తనిఖీ చేయండి:\n * మీ మెషీన్‌లో యాంటీ వైరస్ సాఫ్ట్‌వేర్ ఇన్‌స్టాల్ చేయబడింది\n * మీరు తెలియని యంత్రాలలో ప్లగ్ చేయడానికి ముందు మీ పెన్‌డ్రైవ్ వ్రాతపూర్వకంగా రక్షించబడుతుంది"
+      "description": "మీ పెన్‌డ్రైవ్ లేదా కంప్యూటర్ వైరస్ బారిన పడవచ్చు.  దాన్ని తనిఖీ చేయండి:\n * మీ మెషీన్‌లో యాంటీ వైరస్ సాఫ్ట్‌వేర్ ఇన్‌స్టాల్ చేయబడింది\n * మీరు తెలియని యంత్రాలలో ప్లగ్ చేయడానికి ముందు మీ పెన్‌డ్రైవ్ వ్రాతపూర్వకంగా రక్షించబడుతుంది"
     },
     {
       "topic": "నా పెన్‌డ్రైవ్‌కు మరియు నుండి కంటెంట్‌ను కాపీ చేయడానికి సమయం పడుతుంది",
-      "description": "కాపీ చేయడానికి తీసుకున్న సమయం కంటెంట్ ఫైల్ పరిమాణంపై ఆధారపడి ఉంటుంది. కొన్ని పెద్ద పాఠ్యపుస్తకాలు కాపీ చేయడానికి సమయం పడుతుంది. ఈ ప్రక్రియను మీరు మధ్యలో ఆపవద్దని మేము సిఫార్సు చేస్తున్నాము. అలా చేయడం వలన అస్థిరమైన ఫైళ్లు ఏర్పడవచ్చు."
+      "description": "కాపీ చేయడానికి తీసుకున్న సమయం కంటెంట్ ఫైల్ పరిమాణంపై ఆధారపడి ఉంటుంది.  కొన్ని పెద్ద పాఠ్యపుస్తకాలు కాపీ చేయడానికి సమయం పడుతుంది.  ఈ ప్రక్రియను మీరు మధ్యలో ఆపవద్దని మేము సిఫార్సు చేస్తున్నాము.  అలా చేయడం వలన అస్థిరమైన ఫైళ్లు ఏర్పడవచ్చు."
     },
     {
-      "topic": "DIKSHA కంటెంట్ కారణంగా నా కంప్యూటర్‌కు ఖాళీ స్థలం లేదు",
-      "description": "మీ కంప్యూటర్‌లో ఖాళీ స్థలం కోసం ఖాళీ చేయడానికి అనువర్తనం యొక్క నా డౌన్‌లోడ్ ట్యాబ్ నుండి డౌన్‌లోడ్ చేసిన కంటెంట్‌ను తొలగించండి"
+      "topic": "SUNBIRD కంటెంట్ కారణంగా నా కంప్యూటర్‌కు ఖాళీ స్థలం లేదు",
+      "description": "మీ కంప్యూటర్‌లో  ఖాళీ స్థలం కోసం ఖాళీ చేయడానికి అనువర్తనం యొక్క నా డౌన్‌లోడ్ ట్యాబ్ నుండి డౌన్‌లోడ్ చేసిన కంటెంట్‌ను తొలగించండి"
     },
     {
-      "topic": "నా ఉబుంటు సిస్టమ్‌లో DIKSHA డెస్క్‌టాప్ అప్లికేషన్‌ను ఇన్‌స్టాల్ చేయడం సాధ్యం కాలేదు",
-      "description": "> మీ ఉబుంటు సిస్టమ్‌లో DIKSHA డెస్క్‌టాప్ అప్లికేషన్‌ను ఇన్‌స్టాల్ చేయడానికి: </p>\n <p> 1) మీ టెర్మినల్ తెరవండి </p>\n <p> 2)cd ఆదేశాన్ని అమలు చేయండి <location> డైరెక్టరీని exe ఫైల్ డౌన్‌లోడ్ చేయబడిన చోటికి మార్చడానికి. ఉదాహరణకు, డౌన్‌లోడ్ ఫోల్డర్‌లో exe సేవ్ చేయబడితే, cd డౌన్‌లోడ్‌లు ఆదేశాన్ని అమలు చేయండి</p> \n <p> 3) sudo dpkg -i <filename> ఆదేశాన్ని అమలు చేయండి</p>\n <p> ఈ ఆదేశాన్ని విజయవంతంగా అమలు చేస్తున్నప్పుడు అప్లికేషన్ ప్రారంభించబడింది </p>"
+      "topic": "నా ఉబుంటు సిస్టమ్‌లో SUNBIRD డెస్క్‌టాప్ అప్లికేషన్‌ను ఇన్‌స్టాల్ చేయడం సాధ్యం కాలేదు",
+      "description": "> మీ ఉబుంటు సిస్టమ్‌లో SUNBIRD డెస్క్‌టాప్ అప్లికేషన్‌ను ఇన్‌స్టాల్ చేయడానికి: </p>\n <p> 1) మీ టెర్మినల్ తెరవండి </p>\n <p> 2)cd ఆదేశాన్ని అమలు చేయండి <location> డైరెక్టరీని exe ఫైల్ డౌన్‌లోడ్ చేయబడిన చోటికి మార్చడానికి.  ఉదాహరణకు, డౌన్‌లోడ్ ఫోల్డర్‌లో exe సేవ్ చేయబడితే, cd డౌన్‌లోడ్‌లు ఆదేశాన్ని అమలు చేయండి</p> \n <p> 3) sudo dpkg -i <filename>  ఆదేశాన్ని అమలు చేయండి</p>\n <p> ఈ ఆదేశాన్ని విజయవంతంగా అమలు చేస్తున్నప్పుడు అప్లికేషన్ ప్రారంభించబడింది </p>"
+    },
+    {
+      "topic": "నేను SUNBIRD లో నమోదు చేయాలనుకుంటున్నాను",
+      "description": "SUNBIRD లో సైన్ అప్ చేయడానికి:\n <ul>\n <li> <a href =\"https://staging.sunbirded.org/explore\"target=\"_blank\"> SUNBIRD ను అన్వేషించండి </a> కు వెళ్లండి\n <li> మీరు గురువు లేదా విద్యార్థి కాదా అని ఎంచుకోండి </ li> </li>\n <li> మీ స్థాన వివరాలను నవీకరించండి </ li> </li>\n <li> ప్రొఫైల్‌పై క్లిక్ చేయండి"
+    },
+    {
+      "topic": "నేను నా పాస్వర్డ్ను మర్చిపోయాను",
+      "description": "<p>మీ పాస్‌వర్డ్‌ను రీసెట్ చేయడానికి, ఈ దశలను అనుసరించండి మరియు మీ ఖాతాను తిరిగి పొందండి:\n</p>\n<ul>"
+    },
+    {
+      "topic": "నేను నా స్టేట్ పోర్టల్ ద్వారా SUNBIRD లో లాగిన్ అవ్వాలనుకుంటున్నాను",
+      "description": "<p>మీ స్టేట్ పోర్టల్ ద్వారా SUNBIRD కి లాగిన్ అవ్వడానికిportal:</p><ul><li>వెళ్ళండి <a href=\"https://staging.sunbirded.org/explore\"> అన్వేషించండి SUNBIRD</a>&nbsp;</li><li>మీరు ఎంచుకోండి<strong>ఉపాధ్యాయు డు</strong></li><li>మీ స్థానాన్ని ఎంచుకోండి & nbsp;</li><li>క్లిక్ చేయండి <strong>ప్రొఫైల్</strong> చిహ్నం</li><li>క్లిక్<strong>లాంగిన్</strong></li><li>ఎంచుకోండి <strong>రాష్ట్ర వ్యవస్థతో లాగిన్ అవ్వండి</strong></li><li>మీ రాష్ట్రాన్ని ఎంచుకోండి</li><li> మీరు మీ స్టేట్ పోర్టల్‌కు మళ్ళించబడతారు</li><li>నమోదు చేయండి<strong>వినియోగదారు పేరు</strong> మరియు<strong>పాస్వర్డ్</strong> లో మీ రాష్ట్రం మీకు ఇచ్చినట్లు<strong>లాంగిన్&nbsp;</strong>స్క్రీన్&nbsp;</li><li>క్లిక్ <strong>సమర్పించండి</strong></li><li>వివరాల కోసం స్టేట్ పోర్టల్ ద్వారా లాగిన్ అవ్వండి&nbsp;<a href=\"https://staging.sunbirded.org/help/getting-started/login/#logging-in-with-state-system\">చేరడం</a></li></ul>"
+    },
+    {
+      "topic": "నేను నా ప్రొఫైల్ వివరాలను సవరించాలనుకుంటున్నాను",
+      "description": "మీరు మీ ప్రొఫైల్‌లో ఈ క్రింది వివరాలను సవరించవచ్చు:\n <ul>\n <li> పేరు, రాష్ట్రం మరియు వ్యక్తిగత వివరాలు"
     }
   ],
   "constants": {
diff --git a/utils/DesktopFAQ/faq-ur.json b/utils/DesktopFAQ/faq-ur.json
index 71445fd94..aa883ed56 100644
--- a/utils/DesktopFAQ/faq-ur.json
+++ b/utils/DesktopFAQ/faq-ur.json
@@ -9,20 +9,20 @@
       "description": "ہوسکتا ہے کہ آپ نے YouTube کا مواد ڈاؤن لوڈ کیا ہو۔ جب آپ آن لائن ہوں تو آپ YouTube کا مواد کھول سکتے ہیں۔ کمپیوٹر کو دوبارہ انٹرنیٹ سے جوڑنے کی کوشش کریں۔"
     },
     {
-      "topic": "مجھے اپنی DIKSHA ڈیسک ٹاپ ایپ کو اپ ڈیٹ کرنے کی ضرورت ہے",
-      "description": "اپنے کمپیوٹر کو انٹرنیٹ سے جڑیں اور‪https://staging.sunbirded.org/desktop/latest‬ پر جدید ایپ ورژن کے لئے چیک کریں"
+      "topic": "مجھے اپنی SUNBIRD ڈیسک ٹاپ ایپ کو اپ ڈیٹ کرنے کی ضرورت ہے",
+      "description": "اپنے کمپیوٹر کو انٹرنیٹ  سے جڑیں اور‪https://staging.sunbirded.org/desktop/latest‬ پر جدید ایپ ورژن کے لئے چیک کریں"
     },
     {
       "topic": "مجھے انٹرنیٹ کنیکشن والے لیپ ٹاپ تک رسائی حاصل نہیں ہے ، لیکن میں ڈیسک ٹاپ ایپ پر مواد شامل یا اپ ڈیٹ کرنا چاہتا ہوں",
-      "description": "اگر آپ کے پاس موبائل فون ہے تو ، گوگل پلے اسٹور سے DIKSHA موبائل اپلی کیشن ڈاؤن لوڈ کریں۔\nایپ میں موجود مواد کے لئے براؤز کریں۔\nDIKSHA لائبریری سے مواد ڈاؤن لوڈ کریں۔\nاسے PenDrive یا SD کارڈ میں کاپی کریں اور DIKSHA ڈیسک ٹاپ ایپ پر اپ لوڈ کریں۔"
+      "description": "اگر آپ کے پاس موبائل فون ہے تو ، گوگل پلے اسٹور سے SUNBIRD موبائل اپلی کیشن ڈاؤن لوڈ کریں۔\nایپ میں موجود مواد کے لئے براؤز کریں۔\nSUNBIRD لائبریری سے مواد ڈاؤن لوڈ کریں۔\nاسے PenDrive یا SD کارڈ میں کاپی کریں اور SUNBIRD ڈیسک ٹاپ ایپ پر اپ لوڈ کریں۔"
     },
     {
       "topic": "مجھے کسی خاص عنوان کے لئے مواد نہیں ملتا ہے ، یا مجھے یہ مواد غیر متعلق معلوم ہوتا ہے",
-      "description": "مواد کی تلاش کے لئے DIKSHA کی آن لائن لائبریری کو براؤز کریں۔ اگر یہ ابھی بھی دستیاب نہیں ہے تو، مواد کے بارے میں اپنی رائے اسٹیٹ SCERT کو بھیجیں"
+      "description": "مواد کی تلاش کے لئے SUNBIRD کی آن لائن لائبریری کو براؤز کریں۔ اگر یہ ابھی بھی دستیاب نہیں ہے تو، مواد کے بارے میں اپنی رائے اسٹیٹ SCERT کو بھیجیں"
     },
     {
       "topic": "ایپ بہت آہستہ ہے",
-      "description": "ایپ کی کارکردگی کو تیز کرنے کے لئے ، درج ذیل کام کریں:\n<br>اپنے کمپیوٹر سسٹم کی تشکیل پر جائیں.کم از کم ترتیب یہ ہونی چاہئے:\n‪<li/>2 GB RAM<li>‬‪<ul>‬\n‪<li/>ڈبل کور پروسیسر<li>‬\n</ul>\n<br>اگر آپ کا کمپیوٹر اس ترتیب سے میچ کرتا ہے یا اس سے زیادہ ہے تو ، ایپ کو دوبارہ شروع کریں۔\n<br>ایسا کرنے کے بعد ، اگر یہ اب بھی آہستہ ہے ، تو<b>ٹاسک مینیجر</b>کے پاس جاؤ\nغیر استعمال شدہ پس منظر کے تمام عمل منتخب کریں اور<b>اینڈ ٹاسک</b>پر کلک کریں"
+      "description": "ایپ کی کارکردگی کو تیز کرنے کے لئے ، درج ذیل کام کریں:\n<br>اپنے کمپیوٹر سسٹم کی تشکیل پر جائیں.کم از کم ترتیب یہ ہونی چاہئے:\n‪<li/>2 GB RAM<li>‬‪<ul>‬\n‪<li/>ڈبل کور پروسیسر<li>‬\n</ul>\n<br>اگر آپ کا کمپیوٹر اس ترتیب سے میچ کرتا ہے یا اس سے زیادہ ہے تو ، ایپ کو دوبارہ شروع کریں۔\n<br>ایسا کرنے کے بعد ، اگر یہ اب بھی آہستہ ہے ، تو<b>ٹاسک مینیجر</b>کے پاس جاؤ\nغیر استعمال شدہ پس منظر کے تمام عمل منتخب کریں  اور<b>اینڈ ٹاسک</b>پر کلک کریں"
     },
     {
       "topic": "میں پین ڈرائیو میں مواد کو کاپی کرنے سے قاصر ہوں",
@@ -37,12 +37,28 @@
       "description": "کاپی کرنے میں جو وقت لیا گیا ہے اس کا انحصار مواد کی فائل کے سائز پر ہوتا ہے۔ کچھ بڑی درسی کتب کاپی کرنے میں وقت لگتا ہے۔ ہمارا مشورہ ہے کہ آپ اس عمل میں مداخلت نہ کریں۔ ایسا کرنے سے متضاد فائلیں پیدا ہوسکتی ہیں۔"
     },
     {
-      "topic": "میرے کمپیوٹر میں DIKSHA مشمولات کی وجہ سے کوئی خالی جگہ نہیں ہے",
+      "topic": "میرے کمپیوٹر میں SUNBIRD مشمولات کی وجہ سے کوئی خالی جگہ نہیں ہے",
       "description": "اپنے کمپیوٹر پر جگہ خالی کرنے کے لئے ایپ کے میرے ڈاؤن لوڈ والے ٹیب سے ڈاؤن لوڈ کردہ مواد کو ہٹا دیں"
     },
     {
-      "topic": "میرے Ubuntu سسٹم پر DIKSHA ڈیسک ٹاپ ایپلی کیشن انسٹال کرنے سے قاصر ہے",
-      "description": "<p>میرے Ubuntu سسٹم پر DIKSHA ڈیسک ٹاپ ایپلی کیشن انسٹال کرنے کے لئے:</p>\n<p> اپنا ٹرمینل کھولیں </ p>\n<p> ڈائرکٹری تبدیل کرنے کے لئے سی ڈی کمانڈ چلائیں<مقام>جہاں exe فائل ڈاؤن لوڈ کی گئی ہے.مثال کے طور پر ، اگر ڈاؤن لوڈز فولڈر میں exe کو محفوظ کیا گیا ہے تو ، پھر سی ڈی ڈاؤن لوڈ کمانڈ چلائیں</p>\n<p>کمانڈ sudo dpkg-i چلائیں<filename>\n</p>\n<p> اس کمانڈ کو کامیابی کے ساتھ چلانے پر ایپلیکیشن لانچ کی جاتی ہے </ p>"
+      "topic": "میرے Ubuntu سسٹم پر SUNBIRD ڈیسک ٹاپ ایپلی کیشن انسٹال کرنے سے قاصر ہے",
+      "description": "<p>میرے Ubuntu سسٹم پر SUNBIRD ڈیسک ٹاپ ایپلی کیشن انسٹال کرنے کے لئے:</p>\n<p> اپنا ٹرمینل کھولیں </ p>\n<p> ڈائرکٹری تبدیل کرنے کے لئے سی ڈی کمانڈ چلائیں<مقام>جہاں exe فائل ڈاؤن لوڈ کی گئی ہے.مثال کے طور پر ، اگر ڈاؤن لوڈز فولڈر میں exe کو محفوظ کیا گیا ہے تو ، پھر سی ڈی ڈاؤن لوڈ کمانڈ چلائیں</p>\n<p>کمانڈ sudo dpkg-i چلائیں<filename>\n</p>\n<p> اس کمانڈ کو کامیابی کے ساتھ چلانے پر ایپلیکیشن لانچ کی جاتی ہے </ p>"
+    },
+    {
+      "topic": "میں SUNBIRD میں سائن اپ کرنا چاہتا ہوں",
+      "description": "داکشا پر سائن اپ کرنے کے لیے:\n<ul>\n <li>داکشا کو <a href=\"https://staging.sunbirded.org/explore\" target=\"_blank\">تلاش </a> کرنے کے لئے جاؤ </li>\n<li>منتخب کریں کہ آیا آپ استاد یا طالب علم ہیں</li>\n<li>اپنے مقام کی تفصیلات اپ ڈیٹ کریں</li>\n<li>پروفائل آئکن پر کلک کریں</li>\n<li><b>لاگ ان</b> پر کلک کریں</li>\n<li>لاگ ان سکرین پر <b>یہاں رجسٹر</b> پر کلک کریں</li>\n<li>تفصیلات کے لئے کس طرح رجسٹر https://staging.sunbirded.org/help/getting-started/sign-in/sign-up.html ملاحظہ کریں</li>\n</ul>"
+    },
+    {
+      "topic": "میں اپنا پاسورڈ بھول گیا",
+      "description": "<p/>اپنا پاس ورڈ دوبارہ ترتیب دینے کیلئے ، ان مراحل پر عمل کریں اور اپنا اکاؤنٹ بازیافت کریں:<p>\n‪<ul>‬\n‪<li>کلک کریں <strong>پاس ورڈ بھول گئے</strong></li>‬\n‪<li>  پر رجسٹر کرتے وقت آپ نےجوای میل ایڈریس یا موبائل نمبر اور صارف کا نام فراہم کیا تھا وہ درج کریں SUNBIRD</li>‬ \n‪<li><br></li>‬\n<li/>آپ کو اپنے رجسٹرڈ ای میل یا موبائل نمبر پر OTP مل جائے گا<li>\n‪<li><br></li>‬\n<li/>اپنا پاس ورڈ دوبارہ مرتب کرنے  اور اپنے اکاؤنٹ کی بازیابی کے لئے OTP درج کریں<li> a>اپنے پاس ورڈ کو دوبارہ ترتیب دینے کے لئے<li>\n href=\"https://staging.sunbirded.org/help/getting-started/recover-password/index.htmltarget=_blank\"> پاس ورڈ بازیافت کریں <a/> لنک ملاحظہ کریں<li/>\n‪</ul>‬‬\n"
+    },
+    {
+      "topic": "میں اپنے اسٹیٹ پورٹل کے ذریعے SUNBIRD پر لاگ ان ہونا چاہتا ہوں",
+      "description": "<p>اپنے اسٹیٹ پورٹل کے ذریعے SUNBIRD میں لاگ ان ہونے کے لئے:</p>\n‪<ul>‬\n‪<li> <a href=\"https://staging.sunbirded.org/explore\"> SUNBIRD دریافت کریں</a>\n;nbsp& کے پاس جاؤ</li>\n<li>منتخب کریں کہ آپ ایک<strong>استاد </strong> ہیں</li>\n<li>اپنا مقام منتخب کری </li>\n<li>آئکن<strong>پروفائل</strong> پر کلک کریں</li>\n<li>آئکن<strong>لاگ ان</strong> پر کلک کریں</li>\n<li>منتخب <strong>ریاست کے نظام کے ساتھ لاگ ان کریں</strong>کریں</li>\n<li>اپنی ریاست منتخب کریں</li>\n<li>آپ کو اپنے اسٹیٹ پورٹل پر ری ڈائریکٹ کیا جائے گا</li>\n<strong>لاگ ان</strong>اسکرین ;nbsp& میں آپ کی ریاست کی طرف سے آپ کو دیئے<li> گئے<strong>صارف کا نام</strong><strong>اور</strong><strong>پاس ورڈ</strong>\nدرج کریں</li>\n<li>آئکن<strong>جمع کروائیں</strong> پر کلک کریں</li>\n<a>ریاست پورٹل کے ذریعے لاگ ان کرنے کے لئے تفصیلات کے لئے ملاحظہ کریں<li>\n-href=\"https://staging.sunbirded.org/help/getting-started/login/#logging-in-with-state\n<\"system\nسائن اپ</li/><a>\n</ul>\n\n\n\n"
+    },
+    {
+      "topic": "میں اپنی پروفائل کی تفصیلات میں ترمیم کرنا چاہتا ہوں",
+      "description": "آپ اپنی پروفائل میں درج ذیل تفصیلات کی تدوین کر سکتے ہیں:\n<ul>\n<li>ذاتی تفصیلات جیسے نام ، ریاست ، اور ضلع</li>\n<li>رابطے کی تفصیلات جیسے موبائل نمبر اور ای میل ایڈریس</li>\n<li>دیگر تفصیلات جیسے بورڈ ، درمیانے ، موضوع ، اور کلاس</li>\nپروفائل کی تفصیلات میں ترمیم کرنے کے طریقے کے بارے میں تفصیلات کے لئے ، ملاحظہ کریں\n<a href=\"https://staging.sunbirded.org/help/getting-started/user-profile/index.html\" target=\"_blank\">صارف پروفائل</a>\n</ul>"
     }
   ],
   "constants": {

From 71fcc1a7cc0fa498ce22cb51badd8e6b2f6489d9 Mon Sep 17 00:00:00 2001
From: Rajesh Kumaravel <rajesh.kumaravel@tarento.com>
Date: Wed, 20 Jan 2021 12:45:35 +0530
Subject: [PATCH 137/184] Issue #SB-22354 fix: Reverted portal session secret
 key (#2173)

* Issue #SB-20650 fix: Added anonymous user TTL value

* Issue #SB-20650 fix: Updated anonymous user TTL to 30 minutes

* Issue #SB-22354 fix: Added env variable for API whitelist flag

* Issue #SB-22354 fix: Added env variable for portal session secret key

* Issue #SB-22354 fix: Reverted portal session secret key
---
 ansible/roles/stack-sunbird/templates/sunbird_player.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
index 058f5ceb8..87bbd8a72 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_player.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -152,4 +152,4 @@ sunbird_enable_api_whitelist={{sunbird_enable_api_whitelist|default('true')}}
 # Changing the secret value will invalidate all existing sessions.
 # In order to rotate the secret without invalidating sessions, provide an array of secrets,
 # with the new secret as first element of the array, and followed by previous secrets.
-sunbird_portal_session_secret={{sunbird_portal_session_secret}}
\ No newline at end of file
+# sunbird_portal_session_secret={{sunbird_portal_session_secret}}

From 17d82b315219f01a802b5ed13f471cd61271ea3e Mon Sep 17 00:00:00 2001
From: G33tha <geethap240@gmail.com>
Date: Mon, 25 Jan 2021 15:40:11 +0530
Subject: [PATCH 138/184] added nodebb ansible tasks (#2176)

* added ansible playbook for nodebb db bootsrap

* Create Jenkinfile

* Update bootstrap-mongodb.yml
---
 ansible/bootstrap-mongodb.yml | 20 ++++++++++++++
 pipelines/nodebb/Jenkinsfile  | 52 +++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 ansible/bootstrap-mongodb.yml
 create mode 100644 pipelines/nodebb/Jenkinsfile

diff --git a/ansible/bootstrap-mongodb.yml b/ansible/bootstrap-mongodb.yml
new file mode 100644
index 000000000..faf1a22d5
--- /dev/null
+++ b/ansible/bootstrap-mongodb.yml
@@ -0,0 +1,20 @@
+---
+- hosts: mongo
+  become: yes
+  gather_facts: no
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  tasks:
+    - name: Template and init nodbb db
+      block:
+        - name: Templating nodebb schema
+          copy:
+           content: |-
+             use nodebb
+             db.createUser( { user: "nodebb", pwd: "{{ nodebb_admin_password }}", roles: [ { role: "readWrite", db: "nodebb" }, { role: "clusterMonitor", db: "admin" } ] } )
+           dest: /tmp/nodebb.js
+        - name: Init nodebb db
+          shell: |-
+            mongo < /tmp/nodebb.js
+      tags: 
+        - nodebb
diff --git a/pipelines/nodebb/Jenkinsfile b/pipelines/nodebb/Jenkinsfile
new file mode 100644
index 000000000..c3ce3d9f1
--- /dev/null
+++ b/pipelines/nodebb/Jenkinsfile
@@ -0,0 +1,52 @@
+
+@Library('deploy-conf') _
+node() {
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        stage('checkout public repo') {
+            folder = new File("$WORKSPACE/.git")
+            if (folder.exists())
+            {
+               println "Found .git folder. Clearing it.."
+               sh'git clean -fxd'
+            }
+            checkout scm
+        }
+
+        ansiColor('xterm') {
+            stage('deploy'){
+                values = [:]
+                envDir = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-3].trim()
+                module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim()
+                jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
+                currentWs = sh(returnStdout: true, script: 'pwd').trim()
+                ansiblePlaybook = "${currentWs}/ansible/bootstrap-mongodb.yml"
+                ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass --tags ${params.tag_name}"
+                values.put('currentWs', currentWs)
+                values.put('env', envDir)
+                values.put('module', module)
+                values.put('jobName', jobName)
+                values.put('ansiblePlaybook', ansiblePlaybook)
+                values.put('ansibleExtraArgs', ansibleExtraArgs)
+                println values
+                ansible_playbook_run(values)
+                currentBuild.result = 'SUCCESS'
+                currentBuild.description = "Private: ${params.private_branch}, Public: ${params.branch_or_tag}"
+            }
+        }
+        summary()
+    }
+    catch (err) {
+        currentBuild.result = 'FAILURE'
+        throw err
+    }    
+    finally {
+        slack_notify(currentBuild.result)
+        email_notify()
+    }
+}

From d0f9e8db77a96b4161e5e205b9a0dfde50c59ed0 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 27 Jan 2021 13:19:27 +0530
Subject: [PATCH 139/184] Adding mongodb provision job (#2177)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../jobs/Core/jobs/MongodbCluster/config.xml  | 117 ++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml

diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml
new file mode 100644
index 000000000..51b9561dc
--- /dev/null
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml
@@ -0,0 +1,117 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-196486141556745</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>MongodbCluster</projectName>
+          <projectFullName>Provision/staging/Core/MongodbCluster</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-196486144020383</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>MongodbCluster</projectName>
+          <projectFullName>Provision/staging/Core/MongodbCluster</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/provision/mongodb-cluster/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>

From 5bd91023b8ebc3c2c92c96a4f0d79ec1832fc28c Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 27 Jan 2021 13:30:22 +0530
Subject: [PATCH 140/184] Adding mongodb hosts (#2178)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 private_repo/ansible/inventory/dev/Core/hosts | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/private_repo/ansible/inventory/dev/Core/hosts b/private_repo/ansible/inventory/dev/Core/hosts
index 3fed5ea83..9a7dc7679 100644
--- a/private_repo/ansible/inventory/dev/Core/hosts
+++ b/private_repo/ansible/inventory/dev/Core/hosts
@@ -1,15 +1,15 @@
 # Alert manager nodes which should be clustered
 # This values should be one of any manager node, if you've multinode cluster
 [alert-manager:children]
-# By default this value can be swarm-manager-1 or 2 or n; but for a single 
+# By default this value can be swarm-manager-1 or 2 or n; but for a single
 # cluster it should be one value.
 # If you have multiple cluster you can list all ips below one by one
 swarm-manager-1
 
-[swarm-manager-1] 
+[swarm-manager-1]
 18.0.0.15 swarm_master=true
 
-# This host will make sure prometheus for all stateful services 
+# This host will make sure prometheus for all stateful services
 # will run on a single node, as it has storage dependancy
 # By default this host is same as docker swarm prometheus
 [swarm-agent-for-prometheus-stateful:children]
@@ -36,6 +36,15 @@ keycloak-1
 [log-es:children]
 log-es-2
 
+[mongo_master]
+11.2.3.75 mongodb_master=True
+
+[mongo_replicas] #add ip in case replicaSet
+
+[mongo:children]
+mongo_master
+mongo_replicas
+
 [swarm-agent-for-prometheus-1]
 18.0.0.15
 
@@ -116,10 +125,10 @@ processing-cluster-zookeepers
 18.0.0.51              # Redis master IP of Knowledge platform
 
 [lp-redis-ps:children]
-lp-redis             
+lp-redis
 
 [redis-ps:children]
-lp-redis-ps           
+lp-redis-ps
 
 [redis-exporter-targets:children]
 lp-redis

From 2dd2bf339c2a16360db22caa2422dc0d65116c37 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 27 Jan 2021 13:42:18 +0530
Subject: [PATCH 141/184] Adding mongodb bootstrap jenkins config file (#2179)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../Core/jobs/BootstrapMongodb/config.xml     | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml

diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml
new file mode 100644
index 000000000..c37ca3a3f
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml
@@ -0,0 +1,126 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-196486141556745</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>BootstrapMongodb</projectName>
+          <projectFullName>Provision/dev/Core/BootstrapMongodb</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-196486144020383</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>BootstrapMongodb</projectName>
+          <projectFullName>Provision/dev/Core/BootstrapMongodb</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>tag_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>nodebb</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/nodebb/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>

From f013bcecaf8d59f2c0a425dbd97ae25df25731c5 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 27 Jan 2021 13:54:50 +0530
Subject: [PATCH 142/184] Adding nodebb_admin_password in template secrets
 (#2180)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../ansible/inventory/dev/Core/secrets.yml    | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/private_repo/ansible/inventory/dev/Core/secrets.yml b/private_repo/ansible/inventory/dev/Core/secrets.yml
index 199c25f91..788cc8855 100644
--- a/private_repo/ansible/inventory/dev/Core/secrets.yml
+++ b/private_repo/ansible/inventory/dev/Core/secrets.yml
@@ -1,17 +1,17 @@
-# !! Might deprecate 
-core_vault_sunbird_ekstep_api_key: 
+# !! Might deprecate
+core_vault_sunbird_ekstep_api_key:
 core_vault_sunbird_encryption_key:       #Random hash to encrypt data
-core_vault_kong__test_jwt: 
+core_vault_kong__test_jwt:
 
 ############# Core #######################
 ####### Secrets #######
 
 core_vault_sunbird_trampoline_secret: # some 8 digit password for keycloak sso user
-core_vault_postgres_password: 
-core_vault_sunbird_azure_storage_key : 
+core_vault_postgres_password:
+core_vault_sunbird_azure_storage_key :
 core_vault_docker_registry_url: "https://index.docker.io/v1" # use this value if using dockerhub
-core_vault_docker_registry_user:  
-core_vault_docker_registry_password: 
+core_vault_docker_registry_user:
+core_vault_docker_registry_password:
 core_vault_proxy_site_key: |+
 
 core_vault_proxy_site_crt: |+
@@ -52,7 +52,9 @@ sunbird_azure_artifact_storage_account_key:
 ### release-2.8.0 #####
 core_vault_sunbird_sso_client_secret: #get the lms client secret from keycloak
 
-
+## Nodebb admin user password
+# This is getting used in /discussions
+nodebb_admin_password:
 
 
 
@@ -80,7 +82,7 @@ core_vault_sunbird_sso_client_secret: #get the lms client secret from keycloak
 
 #NOT REQUIRED TO EDIT ##############################
 core_vault_badger_admin_password: "sunbird"
-core_vault_badging_authorization_key: 
+core_vault_badging_authorization_key:
 core_vault_jenkins_admin_username: "" #### if it is not required will remove
 core_vault_jenkins_admin_password: "" #### if it is not required will remove
 core_vault_proxy_prometheus_admin_creds: "admin"
@@ -91,7 +93,7 @@ core_vault_monitor_alerts_slack_url: ""
 
 ######################## Not mandatory ###################################
 core_vault_sunbird_fcm_account_key: ""
-core_vault_sunbird_google_oauth_clientSecret: 
+core_vault_sunbird_google_oauth_clientSecret:
 core_vault_mail_server_password: ''
 core_vault_keycloak_api_management_user_password: admin
 core_vault_keystore_password: sunbird  #Password to use for encrypting cassandra keystore. Use a strong password.
@@ -105,14 +107,14 @@ core_vault_trampoline_secret: "deep-secret" ## any 8 character value
 core_vault_msg_91_auth_key:
 
 # Portal one google sso
-core_vault_sunbird_google_oauth_clientId_portal: 
-core_vault_sunbird_google_oauth_clientSecret_portal: 
-core_vault_sunbird_google_captcha_site_key_portal: 
-core_vault_sunbird_google_keycloak_secret: 
+core_vault_sunbird_google_oauth_clientId_portal:
+core_vault_sunbird_google_oauth_clientSecret_portal:
+core_vault_sunbird_google_captcha_site_key_portal:
+core_vault_sunbird_google_keycloak_secret:
 
 # Oauth for logger kibana
-core_vault_kibana_google_client_id: 
-core_vault_kibana_google_client_secret: 
+core_vault_kibana_google_client_id:
+core_vault_kibana_google_client_secret:
 core_vault_kibana_cookie_secret: kibanaoauth # Cookie secret for kibana Oauth
 
 # sunbird session secret key
@@ -121,5 +123,8 @@ core_vault_kibana_cookie_secret: kibanaoauth # Cookie secret for kibana Oauth
 # with the new secret as first element of the array, and followed by previous secrets.
 sunbird_portal_session_secret:
 
+
+
 # !!!!! DO NOT UPDATE VARS BELOW THIS !!!
 # ***************************************************************************** #
+#

From 70d33bd3eed14a77a5b921a3a932352c022d0c49 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 27 Jan 2021 14:02:47 +0530
Subject: [PATCH 143/184] Adding mongo key gen in private repo (#2181)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../ansible/inventory/dev/Core/secrets.yml    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/private_repo/ansible/inventory/dev/Core/secrets.yml b/private_repo/ansible/inventory/dev/Core/secrets.yml
index 788cc8855..849b7b615 100644
--- a/private_repo/ansible/inventory/dev/Core/secrets.yml
+++ b/private_repo/ansible/inventory/dev/Core/secrets.yml
@@ -52,6 +52,28 @@ sunbird_azure_artifact_storage_account_key:
 ### release-2.8.0 #####
 core_vault_sunbird_sso_client_secret: #get the lms client secret from keycloak
 
+# mongodb keyfile content generated using
+# 'openssl rand -base64 741'
+# eg:
+# mongodb_keyfile_content: |
+#   dzKXABmKNvuhvsbQud1jn84BMrRJdJb92TQbDV+HVAQXt1ATBssnTIJp6DtL1c/H
+#   GHjoOQBuDv1MfymFWxE10dXBlx1IG/pQDeTtC+AOrgyYvIQZNfxHIEfyLao14ZLT
+#   8sV6GAlQQzJFSHGqg174iniZpiibuj8Q7zqGlJgu/4MwcOBSflTlcCbYjkBErBff
+#   +XBi7hNNcPfIizB6XuYwsY59XCLH/g2S3g9aitbunyCAAQUpyFfnOvMezliFlDDh
+#   surRP/lpZ1ZzHtLni2Og8dbOj4J7TLauESd/8Bq+jLzhtBpVn0HoxxF5Se/++z+I
+#   ZfK4fSR2y2uyBSbQJmGZYnlRi4iTN/LGpSg2iZVzOQhUUBvBgYdWSkkYLbl2xTni
+#   d+BbwGnuvSs1gPXaokKqS6IF9zUGK9V2aW0a9qRHGjv3fJXQqB7zRvc1ciJjUwpI
+#   ISsbvlxmZLeDvnQJB3evf/7itSLqNwxMDybn28Ig0E5xBqGCcFbjNjvkkyZPf3YX
+#   +nI/gkSLYCPTFsnFaJSBrRxMn6c4iOwU1zc7GAg9KUuqF/ttLv8SZuooRsEZQsif
+#   zrxXgUHoqkx0WDZiwz91D3VD4hjwSWa3TLEFy8R9ZeSLv0sDihKlPYvW9HlQuUV8
+#   O//HoEA0ajQxjRvJdTskYK6nESOrr+geM477D5Dp3ZKl01ak0HHseJGcoHoMdZOW
+#   dcvAhtKZogLstrT1+qftJcsTAOMWsF4EkpoyPelutEyLrLjfzzSUKlb06x2lKxBt
+#   NoOUHRhhEXe42QMSMYgtT8wE+/LfeB5IMOP1CiC1dGxBjZkZTtSYTSbcB+52H4xi
+#   LhTTEp59/yS6InuJUB6ZzgLGhJoCVg8ZSgSbnngy6Yc4lJpRONlzP7l6A/ins0aA
+#   6PvGBWyEAP+P+6xNVpDkrUPKVIFZDfMMCLVm1sicOgtEBInEpeqhiOygnpO5u12P
+#   IeDCClMkUbhtwTpgVszUe4OA2EXo
+mongodb_keyfile_content: |
+
 ## Nodebb admin user password
 # This is getting used in /discussions
 nodebb_admin_password:

From c04a429552090b816475ac985ff9039b59885d00 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@gmail.com>
Date: Wed, 27 Jan 2021 15:41:18 +0530
Subject: [PATCH 144/184] Steps to create discussionsmw nodebb auth token.

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 private_repo/ansible/inventory/dev/Core/secrets.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/private_repo/ansible/inventory/dev/Core/secrets.yml b/private_repo/ansible/inventory/dev/Core/secrets.yml
index 849b7b615..0df1c1b4b 100644
--- a/private_repo/ansible/inventory/dev/Core/secrets.yml
+++ b/private_repo/ansible/inventory/dev/Core/secrets.yml
@@ -78,6 +78,12 @@ mongodb_keyfile_content: |
 # This is getting used in /discussions
 nodebb_admin_password:
 
+# Steps to generating the Nodebb auth token
+# 1. Login to Nodebb (https://<domain-name>/discussions/login) as a Admin.
+# 2. go to admin panel.
+# 3. click on Plugins => Write API
+# 4. Under MASTER TOKENS section, click on create token button, It will generate a token.
+discussionsmw_nodebb_authorization_token:
 
 
 

From 2cfc70ae5ce3f5779915f3292d2ecb196c0cd649 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 27 Jan 2021 15:59:26 +0530
Subject: [PATCH 145/184] Adding help command to create nodebb admin password.
 (#2184)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 private_repo/ansible/inventory/dev/Core/secrets.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/private_repo/ansible/inventory/dev/Core/secrets.yml b/private_repo/ansible/inventory/dev/Core/secrets.yml
index 0df1c1b4b..cf1623508 100644
--- a/private_repo/ansible/inventory/dev/Core/secrets.yml
+++ b/private_repo/ansible/inventory/dev/Core/secrets.yml
@@ -76,6 +76,8 @@ mongodb_keyfile_content: |
 
 ## Nodebb admin user password
 # This is getting used in /discussions
+# use below command to use a random password
+# 'openssl rand -hex 10'
 nodebb_admin_password:
 
 # Steps to generating the Nodebb auth token

From 1d64d852254bbeb5ac9a062b21f7dbf21a7c345b Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 28 Jan 2021 15:50:59 +0530
Subject: [PATCH 146/184] feat: TG-733 updating role to deploy filebeat on all
 hosts (#2185)

---
 ansible/logging.yml                           | 134 ++-------------
 .../vm-agents-filebeat/defaults/main.yml      |  76 +--------
 .../roles/vm-agents-filebeat/tasks/main.yml   | 137 ++++++++++------
 .../templates/filebeat-inputs.yml.j2          | 153 ++++++++++++++++++
 .../templates/filebeat.yml.j2                 |  91 +++++++++--
 5 files changed, 328 insertions(+), 263 deletions(-)
 create mode 100644 ansible/roles/vm-agents-filebeat/templates/filebeat-inputs.yml.j2

diff --git a/ansible/logging.yml b/ansible/logging.yml
index fd3dc74c9..426a6531d 100644
--- a/ansible/logging.yml
+++ b/ansible/logging.yml
@@ -1,126 +1,14 @@
 ---
-- hosts: swarm-nodes
-  become: yes
-  tasks:
-  - name: Spray cluster name to nodes
-    copy: dest=/home/deployer/cluster_name content="{{ cluster_name }}"
-    when: cluster_name is defined
-  tags:
-    - stack-logger
-
-- hosts: swarm-bootstrap-manager
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml']
-  roles:
-    - stack-logger
-  tags:
-    - stack-logger
-  run_once: true
-
-- hosts: swarm-dashboard
+# You can choose host names on jenkins and run the job. If you have custom host groups, you can add them to jenkins job and run
+# To start or stop filebeat, choose the tag on jenkins job
+- hosts: "{{ hosts }}"
   become: yes
+  gather_facts: no
+  ignore_unreachable: yes
   vars_files:
-    - ['{{inventory_dir}}/secrets.yml']
-  roles:
-    - stack-kibana
-  tags:
-    - stack-kibana
-
-- hosts: swarm-dashboard
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml']
-  roles:
-    - stack-oauth
-  tags:
-    - stack-oauth
-
-- hosts: log-forwarder
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml']
-  roles:
-    - vm-agents-filebeat
-  tags:
-    - log-forwarder
-
-- hosts: lp-learning-ps
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - { role: vm-agents-filebeat, filebeat_log_path: '/data/logs/learning_service_mw.log' }
-  tags:
-    - learningall 
-    - filebeat
-                      
-- hosts: lp-search-ps
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - { role: vm-agents-filebeat, filebeat_log_path: '/data/logs/search_service_mw.log' }
-  tags:            
-    - searchall
-    - filebeat
-
-- hosts: dp-neo4j-ps
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - { role: vm-agents-filebeat, filebeat_log_path: '/home/learning/neo4j-learning/neo4j-enterprise-3.3.0/logs/neo4j.log' }
-  tags:            
-    - neo4j
-    - filebeat
-
-- hosts: cassandra-ps
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - { role: vm-agents-filebeat, filebeat_log_path: '/var/log/cassandra/debug.log' }
-  tags:            
-    - cassandra
-    - filebeat
-
-- hosts: dp-analytics-ps
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - { role: vm-agents-filebeat, filebeat_log_path: '/mount/data/analytics/logs/services/api-service.log, /var/log/logstash/logstash-plain.log' }
-  tags:            
-    - analytics
-    - filebeat
-
-- hosts: dp-kafkaindexer-ps
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - { role: vm-agents-filebeat, filebeat_log_path: '/var/log/logstash/logstash-plain.log' }
-  tags:            
-    - kafkaindexer
-    - filebeat
-      
-- hosts: zookeeper
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - { role: vm-agents-filebeat, filebeat_log_path: '/var/log/zookeeper/zookeeper.log' }
-  tags: 
-    - zookeeper
-    - filebeat
-
-- hosts: keycloak
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - { role: vm-agents-filebeat, filebeat_log_path: '/opt/keycloak/standalone/log/server.log' }                   
-  tags:     
-    - keycloak
-    - filebeat
+    - "{{inventory_dir}}/secrets.yml"
+  tasks:
+  - include_role:
+     name: vm-agents-filebeat
+    tags:
+    - "{{ tags }}"
diff --git a/ansible/roles/vm-agents-filebeat/defaults/main.yml b/ansible/roles/vm-agents-filebeat/defaults/main.yml
index 69eccee2f..28ea4936a 100644
--- a/ansible/roles/vm-agents-filebeat/defaults/main.yml
+++ b/ansible/roles/vm-agents-filebeat/defaults/main.yml
@@ -1,74 +1,2 @@
----
-# The version of filebeat to install
-filebeat_version: 1.3.1
-
-# `filebeat_config` is templated directly into filebeat.yml for the config.
-# You are expected to override this variable, as these configurations are
-# only suited for development purposes.
-# See https://github.com/elastic/beats/blob/master/filebeat/filebeat.yml for
-# an exhaustive list of configurations.
-filebeat_config:
-  filebeat:
-    prospectors:
-      - paths:
-          - /var/log/messages
-          - /var/log/*.log
-        input_type: log
-  output:
-    file:
-      path: /tmp/filebeat
-      filename: filebeat
-  logging:
-    to_syslog: true
-    level: error
-
-# The contents of this variable will be placed into the `filebeat_ca_path`
-# This should either be set to a string containing your CA certificate or
-# use a lookup plugin to retrieve it.
-#  ex:
-#   filebeat_ca_cert: "{{ lookup('file', '/path/to/ca.crt') }}"
-filebeat_ca_cert: null
-# Path to which the above certificate will be uploaded
-filebeat_ca_path: /etc/filebeat/ca.crt
-
-# Similar to the above but for ssl cert and ssl key
-filebeat_ssl_cert: null
-filebeat_ssl_cert_path: /etc/filebeat/ssl.crt
-filebeat_ssl_key: null
-filebeat_ssl_key_path: /etc/filebeat/ssl.key
-
-# Repository settings
-filebeat_gpg_url: https://packages.elastic.co/GPG-KEY-elasticsearch
-## Debian
-filebeat_apt_repo_v1: "deb https://packages.elastic.co/beats/apt stable main"
-filebeat_apt_repo_v5: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
-filebeat_apt_repo: "{{ filebeat_version|version_compare('5', '<')|ternary(filebeat_apt_repo_v1, filebeat_apt_repo_v5) }}"
-## Redhat
-filebeat_repo_url_v1: https://packages.elastic.co/beats/yum/el/$basearch
-filebeat_repo_url_v5: https://artifacts.elastic.co/packages/5.x/yum
-filebeat_repo_url: "{{ filebeat_version|version_compare('5', '<')|ternary(filebeat_repo_url_v1, filebeat_repo_url_v5) }}"
-
-filebeath_log_path: "{{ filebeath_log_path }}"
-filebeat_logstash_port: 5044
-filebeat_logstash_host: "{{groups['swarm-manager'][0]}}"
-filebeat:
-  base_path: /etc/filebeat
-  config:
-    filebeat:
-      prospectors:
-        - paths:
-            - "{{ filebeat_log_path }}" 
-          input_type: log
-    output:
-      logstash:
-        hosts:
-          - "{{ filebeat_logstash_host }}:{{ filebeat_logstash_port }}"
-        timeout: 15
-    logging:
-        level: debug
-        to_files: true
-        to_syslog: false
-        files:
-            path: /tmp/filebeat
-            name: filebeat.log
-            keepfiles: 7
+filebeat_version: "6.8.13"
+filebeat_config_directory: "/etc/filebeat/configs"
diff --git a/ansible/roles/vm-agents-filebeat/tasks/main.yml b/ansible/roles/vm-agents-filebeat/tasks/main.yml
index 5c00c0a30..8dab7da33 100644
--- a/ansible/roles/vm-agents-filebeat/tasks/main.yml
+++ b/ansible/roles/vm-agents-filebeat/tasks/main.yml
@@ -1,66 +1,97 @@
 ---
-- debug:
-    msg: "Installing on {{ansible_os_family}}"
+- name: Gather package facts
+  package_facts:
+    manager: auto
+  tags:
+   - default
 
-- include: redhat.yml
-  when: ansible_os_family == 'RedHat'
+- name: Check the filebeat version if its already installed
+  set_fact:
+    filebeat_installed_version: "{{ansible_facts.packages['filebeat'][0].version}}"
+  when: "ansible_facts.packages is defined and 'filebeat' in ansible_facts.packages and (ansible_facts.packages['filebeat'] | length) == 1"
+  tags:
+   - default
 
-- include: debian.yml
-  when: ansible_os_family == 'Debian'
+- name: Remove filebeat package if it does not match the version which is being installed
+  apt:
+    name: filebeat
+    state: absent
+  when: filebeat_installed_version is defined and filebeat_installed_version != filebeat_version
+  tags:
+   - default
 
-- include: darwin.yml
-  when: ansible_os_family == 'Darwin'
+- name: Remove filebeat registry directory if it does not match the version which is being installed
+  file: 
+    path: /var/lib/filebeat/registry
+    state: absent
+  when: filebeat_installed_version is defined and filebeat_installed_version != filebeat_version
+  tags:
+   - default
 
-- name: list
-  debug:
-    msg: "{{ filebeat_log_path }}"
+- name: Add elastic gpg key
+  apt_key:
+    url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
+    state: present
+  tags:
+   - default
 
-- name: create filebeat.yml
-  template:
-    src: filebeat.yml.j2
-    dest: "{{filebeat.base_path}}/filebeat.yml"
-  notify:
-    - restart filebeat
+- name: Add elastic repository
+  apt_repository:
+    repo: deb https://artifacts.elastic.co/packages/6.x/apt stable main
+    state: present
+    filename: /etc/apt/sources.list.d/elastic-6.x.list
+  tags:
+   - default
 
-- name: copy ca certificate if required
-  copy:
-    content: "{{ filebeat_ca_cert }}"
-    dest: "{{ filebeat_ca_path }}"
-    owner: root
-    group: root
-    mode: 0400
-  when: filebeat_ca_cert != None
+- name: Install the filebeat and required packages
+  apt:
+    name: ['apt-transport-https', 'filebeat={{filebeat_version}}']
+    state: present
+    update_cache: yes
+    cache_valid_time: 3600
+  tags:
+   - default
 
-- name: copy ssl certificate if required
-  copy:
-    content: "{{ filebeat_ssl_cert }}"
-    dest: "{{ filebeat_ssl_cert_path }}"
-    owner: root
-    group: root
-    mode: 0400
-  when: filebeat_ssl_cert != None
+- name: Create the filebeat configs directory
+  file:
+    path: "{{filebeat_config_directory}}"
+    state: directory
+  tags:
+   - default
 
-- name: copy ssl key if required
-  copy:
-    content: "{{ filebeat_ssl_key }}"
-    dest: "{{ filebeat_ssl_key_path }}"
-    owner: root
-    group: root
-    mode: 0400
-  when: filebeat_ssl_key != None
+- name: Copy the filebeat input config template(s)
+  template:
+    src: "filebeat-inputs.yml.j2"
+    dest: "{{filebeat_config_directory}}/filebeat-inputs.yml"
+  tags:
+   - default
 
-- name: flush handlers to prevent start then restart
-  meta: flush_handlers
+- name: Copy the filebeat outout config template
+  template:
+    src: "filebeat.yml.j2"
+    dest: "/etc/filebeat/filebeat.yml"
+  tags:
+   - default
 
-- name: start and enable filebeat
-  service:
+- name: Enable and start filebeat as a daemon process
+  systemd:
     name: filebeat
-    state: started
-#    enabled: true
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'Debian'
+    enabled: yes
+    state: restarted
+    daemon_reload: yes
+  tags:
+   - default
 
-- name: start and enable filebeat
-  command: ./filebeat -c filebeat.yml -d "publish"
-  args:
-    chdir: "{{filebeat.base_path}}"
-  when: ansible_os_family == 'Darwin'
+- name: Stop filebeat
+  systemd:
+    name: filebeat
+    state: stopped
+  tags:
+   - stop-filebeat
+
+- name: Start filebeat
+  systemd:
+    name: filebeat
+    state: started
+  tags:
+   - start-filebeat
diff --git a/ansible/roles/vm-agents-filebeat/templates/filebeat-inputs.yml.j2 b/ansible/roles/vm-agents-filebeat/templates/filebeat-inputs.yml.j2
new file mode 100644
index 000000000..55edda034
--- /dev/null
+++ b/ansible/roles/vm-agents-filebeat/templates/filebeat-inputs.yml.j2
@@ -0,0 +1,153 @@
+#=========================== Cassandra =============================
+- type: log
+  enabled: true
+  paths:
+    - /var/log/cassandra/system.log
+    - /var/log/cassandra/debug.log
+  multiline.pattern: '^[INFO|ERROR|WARN|DEBUG]'
+  multiline.negate: true
+  multiline.match: after
+
+- type: log
+  enabled: true
+  paths:
+  - /var/log/cassandra/gc.log.0
+  multiline.pattern: '^[0-9]{4}-[0-9]{2}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Elasticsearch =============================
+- type: log
+  enabled: true
+  paths:
+    - /var/log/elasticsearch/*/*.log
+  multiline.pattern: '^\['
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Kafka =============================
+- type: log
+  enabled: true
+  paths:
+    - /var/log/kafka/*.log
+  multiline.pattern: '^\['
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Keycloak =============================
+- type: log
+  enabled: true
+  paths:
+    - /opt/keycloak/standalone/log/server.log
+  multiline.pattern: '^[0-9]{4}-[0-9]{2}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Learning =============================
+- type: log
+  enabled: true
+  paths:
+    - /data/logs/learning_service_mw.log
+    - /data/logs/learning_telemetry_event_mw.log
+    - /data/logs/learning_perf_mw.log
+  multiline.pattern: '^[0-9]{4}-[0-9]{2}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+
+- type: log
+  enabled: true
+  paths:
+  - /home/learning/apache-tomcat-8.0.36/logs/catalina.out
+  multiline.pattern: '^[0-9]{4}-[A-Za-z]{3}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Logstash =============================
+- type: log
+  enabled: true
+  paths:
+  - /home/learning/logstash-6.3.1/logs/logstash-plain.log
+  - /home/learning/logstash-6.3.1/logs/logstash-slowlog-plain.log
+  - /var/log/logstash/logstash-plain.log
+  - /var/log/logstash/logstash-slowlog-plain.log
+  multiline.pattern: '^\['
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Neo4j =============================
+- type: log
+  enabled: true
+  paths:
+    - /home/learning/neo4j-learning/*/logs/debug.log
+    - /home/learning/neo4j-learning/*/logs/gc.log.0.current
+    - /home/learning/neo4j-learning/*/logs/neo4j.log
+    - /home/learning/neo4j-learning/*/logs/query.log
+    - /data/logs/learning_graph_event_neo4j.log
+    - /data/logs/learning_service_neo4j.log
+  multiline.pattern: '^[0-9]{4}-[0-9]{2}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Redis =============================
+- type: log
+  enabled: true
+  paths:
+    - /home/analytics/redis-stable/redis.log
+    - /home/learning/redis-stable/redis.log
+  multiline.pattern: '^[0-9]*?:[M|S|C|X]'
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Spark =============================
+- type: log
+  enabled: true
+  paths:
+    - /mount/data/analytics/logs/*/*.log
+  multiline.pattern: '^[0-9]{2,4}[-|/][0-9]{2}[-|/][0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Syslog =============================
+- type: log
+  enabled: true
+  paths:
+    - /var/log/*log
+  exclude_files: ['/var/log/keycloak.err.log', '/var/log/keycloak.out.log']
+
+#=========================== Zookeeper =============================
+- type: log
+  enabled: true
+  paths:
+    - /var/log/zookeeper/*.log
+  multiline.pattern: '^[0-9]{4}-[0-9]{2}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Dial =============================
+- type: log
+  enabled: true
+  paths:
+    - /data/logs/dial_graph_event_mw.log
+    - /data/logs/dial_service_mw.log
+    - /data/logs/dial_telemetry_event_mw.log
+  multiline.pattern: '^[0-9]{4}-[0-9]{2}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Secor =============================
+- type: log
+  enabled: true
+  paths:
+    - /mount/secor/logs/*.log
+  multiline.pattern: '^[0-9]{4}-[0-9]{2}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+
+#=========================== Postgres VM =============================
+- type: log    
+  enabled: true
+  paths:
+    - /var/log/postgresql/*.log
+  multiline.pattern: '^[0-9]{4}-[0-9]{2}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
diff --git a/ansible/roles/vm-agents-filebeat/templates/filebeat.yml.j2 b/ansible/roles/vm-agents-filebeat/templates/filebeat.yml.j2
index e31090f7b..87ac65a2b 100644
--- a/ansible/roles/vm-agents-filebeat/templates/filebeat.yml.j2
+++ b/ansible/roles/vm-agents-filebeat/templates/filebeat.yml.j2
@@ -1,13 +1,78 @@
-filebeat:
-  prospectors:
-  - input_type: log
-    paths: [{{ filebeat_log_path }}]
-logging:
-  files: {keepfiles: 7, name: filebeat.log, path: /tmp/filebeat}
-  level: debug
-  to_files: true
-  to_syslog: false
-output:
-  logstash:
-    hosts: ['{{ filebeat_logstash_host }}:{{ filebeat_logstash_port }}']
-    timeout: 15
+#=========================== Filebeat inputs =============================
+filebeat.config.inputs:
+  enabled: true
+  path: "{{filebeat_config_directory}}/*.yml"
+
+#==================== Elasticsearch template setting ==========================
+setup.template.name: "filebeat"
+setup.template.pattern: "filebeat-*"
+setup.template.overwrite: false
+setup.template.settings:
+  index.number_of_shards: 3
+
+#================================ Outputs =====================================
+
+#-------------------------- Elasticsearch output ------------------------------
+output.elasticsearch:
+  # Array of hosts to connect to.
+  hosts: ["{{ groups['log-es']|join(':9200\", \"')}}:9200"]
+  indices:
+  - index: "redis-dp-%{+yyyy.MM.dd}"
+    when.contains:
+      source: analytics/redis-stable/
+  - index: "redis-kp-%{+yyyy.MM.dd}"
+    when.contains:
+      source: learning/redis-stable/
+  - index: "spark-%{+yyyy.MM.dd}"
+    when.contains:
+      source: /mount/data/analytics/logs/
+  - index: "cassandra-%{+yyyy.MM.dd}"
+    when.contains:
+      source: cassandra
+  - index: "composite-es-%{+yyyy.MM.dd}"
+    when.regexp:
+      source: elasticsearch/.*cs-node.*
+  - index: "log-es-%{+yyyy.MM.dd}"
+    when.regexp:
+      source: elasticsearch/.*log-es.*/
+  - index: "lms-es-%{+yyyy.MM.dd}"
+    when.regexp:
+      source: elasticsearch/.*es.*/
+  - index: "keycloak-%{+yyyy.MM.dd}"
+    when.contains:
+      source: /opt/keycloak/standalone/log/
+  - index: "neo4j-%{+yyyy.MM.dd}"
+    when.contains:
+      source: neo4j
+  - index: "dial-%{+yyyy.MM.dd}"
+    when.contains:
+      source: dial
+  - index: "logstash-vm-%{+yyyy.MM.dd}"
+    when.contains:
+      source: logstash
+  - index: "learning-%{+yyyy.MM.dd}"
+    when.contains:
+      source: /data/logs/learning
+  - index: "kafka-%{+yyyy.MM.dd}"
+    when.contains:
+      source: kafka
+  - index: "zookeeper-%{+yyyy.MM.dd}"
+    when.contains:
+      source: zookeeper
+  - index: "secor-%{+yyyy.MM.dd}"
+    when.contains:
+      source: secor
+  - index: "postgres-%{+yyyy.MM.dd}"
+    when.contains:
+      source: postgres
+  - index: "syslogs-%{+yyyy.MM.dd}"
+
+#----------------------------- Logstash output --------------------------------
+#output.logstash:
+  # The Logstash hosts
+  #hosts: ["localhost:5044"]
+
+#----------------------------- General --------------------------------
+max_procs: 1
+ignore_older: 24h
+close_inactive: 12h

From ef12edb41bdeb603c367d90e43bbe6909d4d446a Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 28 Jan 2021 15:51:14 +0530
Subject: [PATCH 147/184] fix: updating init comments for keycloak init.d
 script (#2186)

---
 .../keycloak-provision/templates/keycloak-service.j2   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ansible/roles/keycloak-provision/templates/keycloak-service.j2 b/ansible/roles/keycloak-provision/templates/keycloak-service.j2
index b11aff94b..cce1ab3f7 100644
--- a/ansible/roles/keycloak-provision/templates/keycloak-service.j2
+++ b/ansible/roles/keycloak-provision/templates/keycloak-service.j2
@@ -1,4 +1,14 @@
 #!/bin/bash
+### BEGIN INIT INFO
+# Provides:          keycloak
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Should-Start:      $all
+# Should-Stop:       $all
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 6
+### END INIT INFO
+
 keycloakuser=keycloak
 keycloakpath=/opt/keycloak/bin
 

From 49f7c0c4a3b366051ea9cd321d206194c86ed123 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 28 Jan 2021 15:51:37 +0530
Subject: [PATCH 148/184] fix: updating ansible verison to 2.7.18 (#2187)

---
 deploy/jenkins/jenkins-server-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh
index c28e87690..30f623b68 100755
--- a/deploy/jenkins/jenkins-server-setup.sh
+++ b/deploy/jenkins/jenkins-server-setup.sh
@@ -66,7 +66,7 @@ ln -s /usr/local/lib/node-v6.17.1-linux-x64/bin/gulp /usr/bin/gulp
 rm -rf node-v6.17.1-linux-x64*
 
 echo -e "\n\e[0;32m${bold}Installating Ansible${normal}"
-pip install ansible==2.5.2
+pip install ansible==2.7.18
 
 echo -e "\n\e[0;32m${bold}Installating azure cli${normal}"
 apt-get install ca-certificates curl apt-transport-https lsb-release gnupg

From 1817fdd551595671576bd6bea8046c1c9a9e9035 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 28 Jan 2021 15:51:53 +0530
Subject: [PATCH 149/184] fix: updating process exporter and host details
 dashboard (#2188)

---
 .../dashboards/dashboards/host-details.json   | 523 ++++++++----------
 .../dashboards/process-exporter.json          |  56 +-
 2 files changed, 268 insertions(+), 311 deletions(-)

diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/host-details.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/host-details.json
index bfdfa3109..9cc11131b 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/dashboards/host-details.json
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/host-details.json
@@ -16,8 +16,7 @@
   "editable": true,
   "gnetId": 2666,
   "graphTooltip": 0,
-  "id": 111,
-  "iteration": 1587138485395,
+  "iteration": 1611320586220,
   "links": [],
   "panels": [
     {
@@ -33,6 +32,12 @@
       "decimals": null,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -64,7 +69,6 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
-      "options": {},
       "postfix": "",
       "postfixFontSize": "50%",
       "prefix": "",
@@ -117,6 +121,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "percentunit",
       "gauge": {
         "maxValue": 100,
@@ -148,7 +158,6 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
-      "options": {},
       "postfix": "",
       "postfixFontSize": "50%",
       "prefix": "",
@@ -166,7 +175,7 @@
         "lineColor": "rgb(31, 120, 193)",
         "show": true
       },
-      "tableColumn": "",
+      "tableColumn": "{instance=\"28.0.2.25:9100\", job=\"vm-node-exporter\"}",
       "targets": [
         {
           "expr": "node_load1{instance='$server:9100'} / count by (cluster, job, instance)(count by(cluster, job, instance, cpu)(node_cpu_seconds_total{instance='$server:9100'}))",
@@ -200,6 +209,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "percent",
       "gauge": {
         "maxValue": 100,
@@ -232,7 +247,6 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
-      "options": {},
       "postfix": "",
       "postfixFontSize": "50%",
       "prefix": "",
@@ -288,6 +302,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "bytes",
       "gauge": {
         "maxValue": 100,
@@ -320,7 +340,6 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
-      "options": {},
       "postfix": "",
       "postfixFontSize": "50%",
       "prefix": "",
@@ -338,7 +357,7 @@
         "lineColor": "rgb(31, 120, 193)",
         "show": false
       },
-      "tableColumn": "",
+      "tableColumn": "node_memory_MemAvailable_bytes{instance=\"28.0.2.25:9100\", job=\"vm-node-exporter\"}",
       "targets": [
         {
           "expr": "node_memory_MemAvailable_bytes{instance=~\"$server:9100\"}",
@@ -377,6 +396,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -409,7 +434,6 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
-      "options": {},
       "pluginVersion": "6.5.2",
       "postfix": "",
       "postfixFontSize": "50%",
@@ -428,7 +452,7 @@
         "lineColor": "rgb(31, 120, 193)",
         "show": false
       },
-      "tableColumn": "",
+      "tableColumn": "{instance=\"28.0.2.25:9100\", job=\"vm-node-exporter\"}",
       "targets": [
         {
           "expr": "count without(cpu, mode) (node_cpu_seconds_total{mode=\"idle\", instance=\"$server:9100\"})",
@@ -467,6 +491,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "bytes",
       "gauge": {
         "maxValue": 100,
@@ -499,7 +529,6 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
-      "options": {},
       "postfix": "",
       "postfixFontSize": "50%",
       "prefix": "",
@@ -556,6 +585,12 @@
       "decimals": 1,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "s",
       "gauge": {
         "maxValue": 100,
@@ -587,7 +622,6 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
-      "options": {},
       "postfix": "",
       "postfixFontSize": "50%",
       "prefix": "",
@@ -605,7 +639,7 @@
         "lineColor": "rgb(31, 120, 193)",
         "show": false
       },
-      "tableColumn": "",
+      "tableColumn": "{instance=\"28.0.2.25:9100\", job=\"vm-node-exporter\"}",
       "targets": [
         {
           "expr": "time() - node_boot_time_seconds{instance=~\"$server:9100\"}",
@@ -637,6 +671,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 3,
       "fillGradient": 0,
       "grid": {},
@@ -737,6 +777,12 @@
       "decimals": 2,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 4,
       "fillGradient": 0,
       "grid": {},
@@ -847,6 +893,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "grid": {},
@@ -982,6 +1034,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "percent",
       "gauge": {
         "maxValue": 100,
@@ -1013,7 +1071,6 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
-      "options": {},
       "postfix": "",
       "postfixFontSize": "50%",
       "prefix": "",
@@ -1031,7 +1088,7 @@
         "lineColor": "rgb(31, 120, 193)",
         "show": false
       },
-      "tableColumn": "",
+      "tableColumn": "{instance=\"28.0.2.25:9100\", job=\"vm-node-exporter\"}",
       "targets": [
         {
           "expr": "(node_memory_MemAvailable_bytes{instance=~\"$server:9100\"} / node_memory_MemTotal_bytes{instance=~\"$server:9100\"}) * 100",
@@ -1064,6 +1121,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "grid": {},
@@ -1199,6 +1262,12 @@
       "decimals": 2,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "grid": {},
@@ -1327,6 +1396,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -1423,6 +1498,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "percentunit",
       "gauge": {
         "maxValue": 1,
@@ -1454,7 +1535,6 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
-      "options": {},
       "postfix": "",
       "postfixFontSize": "50%",
       "prefix": "",
@@ -1504,6 +1584,12 @@
       "dashes": false,
       "datasource": "Prometheus",
       "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -1597,24 +1683,33 @@
       "dashes": false,
       "datasource": "PrometheusProcessExporter",
       "decimals": 2,
-      "description": "",
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
+      "grid": {},
       "gridPos": {
-        "h": 6,
-        "w": 24,
+        "h": 8,
+        "w": 12,
         "x": 0,
         "y": 29
       },
       "hiddenSeries": false,
-      "id": 22,
+      "id": 23,
+      "isNew": true,
       "legend": {
         "alignAsTable": true,
         "avg": true,
         "current": true,
         "max": true,
         "min": false,
-        "rightSide": true,
+        "rightSide": false,
         "show": true,
         "sideWidth": null,
         "sort": "max",
@@ -1623,7 +1718,7 @@
         "values": true
       },
       "lines": true,
-      "linewidth": 1,
+      "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
       "options": {
@@ -1639,13 +1734,13 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(rate(namedprocess_namegroup_cpu_seconds_total{groupname=~\"$processes\", instance=\"$server:9256\"}[$interval])) by (groupname)",
-          "format": "time_series",
+          "expr": "sum(rate(namedprocess_namegroup_cpu_seconds_total{groupname=~\"$processes\", instance=~\"$server:9256\"}[$interval])) by (groupname,instance)",
           "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "{{groupname}}",
+          "intervalFactor": 1,
+          "legendFormat": "{{instance}} | {{groupname}}",
+          "metric": "process_namegroup_cpu_seconds_total",
           "refId": "A",
-          "step": 2
+          "step": 10
         }
       ],
       "thresholds": [],
@@ -1654,9 +1749,10 @@
       "timeShift": null,
       "title": "Process CPU Usage",
       "tooltip": {
+        "msResolution": false,
         "shared": true,
         "sort": 0,
-        "value_type": "individual"
+        "value_type": "cumulative"
       },
       "type": "graph",
       "xaxis": {
@@ -1668,16 +1764,16 @@
       },
       "yaxes": [
         {
-          "decimals": 2,
+          "$$hashKey": "object:353",
           "format": "percentunit",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": 0,
           "show": true
         },
         {
-          "decimals": null,
+          "$$hashKey": "object:354",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1698,33 +1794,39 @@
       "dashes": false,
       "datasource": "PrometheusProcessExporter",
       "decimals": 2,
-      "description": "",
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
+      "grid": {},
       "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 35
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 29
       },
       "hiddenSeries": false,
-      "id": 23,
+      "id": 25,
+      "isNew": true,
       "legend": {
         "alignAsTable": true,
         "avg": true,
         "current": true,
         "max": true,
         "min": false,
-        "rightSide": true,
+        "rightSide": false,
         "show": true,
-        "sideWidth": 750,
-        "sort": "max",
-        "sortDesc": true,
         "total": false,
         "values": true
       },
       "lines": true,
-      "linewidth": 1,
+      "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
       "options": {
@@ -1740,13 +1842,13 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "namedprocess_namegroup_memory_bytes{groupname=~\"$processes\", memtype=\"resident\", instance=\"$server:9256\"}",
-          "format": "time_series",
+          "expr": "namedprocess_namegroup_memory_bytes{groupname=~\"$processes\", memtype=\"resident\", instance=~\"$server:9256\"}",
           "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "{{groupname}}",
+          "intervalFactor": 1,
+          "legendFormat": "{{instance}} | {{groupname}}",
+          "metric": "namedprocess_namegroup_memory_bytes",
           "refId": "A",
-          "step": 2
+          "step": 10
         }
       ],
       "thresholds": [],
@@ -1755,6 +1857,7 @@
       "timeShift": null,
       "title": "Process Memory Usage",
       "tooltip": {
+        "msResolution": false,
         "shared": true,
         "sort": 0,
         "value_type": "individual"
@@ -1769,11 +1872,11 @@
       },
       "yaxes": [
         {
-          "format": "decbytes",
+          "format": "bytes",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": 0,
           "show": true
         },
         {
@@ -1797,33 +1900,41 @@
       "dashes": false,
       "datasource": "PrometheusProcessExporter",
       "decimals": 2,
-      "description": "",
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
+      "grid": {},
       "gridPos": {
-        "h": 6,
-        "w": 24,
+        "h": 8,
+        "w": 12,
         "x": 0,
-        "y": 41
+        "y": 37
       },
       "hiddenSeries": false,
-      "id": 24,
+      "id": 27,
+      "isNew": true,
       "legend": {
         "alignAsTable": true,
         "avg": true,
         "current": true,
         "max": true,
         "min": false,
-        "rightSide": true,
+        "rightSide": false,
         "show": true,
-        "sideWidth": null,
         "sort": "max",
         "sortDesc": true,
         "total": false,
         "values": true
       },
       "lines": true,
-      "linewidth": 1,
+      "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
       "options": {
@@ -1839,13 +1950,13 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "namedprocess_namegroup_memory_bytes{groupname=~\"$processes\", memtype=\"virtual\", instance=\"$server:9256\"}",
-          "format": "time_series",
+          "expr": "namedprocess_namegroup_memory_bytes{groupname=~\"$processes\", memtype=\"virtual\", instance=~\"$server:9256\"}",
           "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "{{groupname}}",
+          "intervalFactor": 1,
+          "legendFormat": "{{instance}} | {{groupname}}",
+          "metric": "namedprocess_namegroup_memory_bytes",
           "refId": "A",
-          "step": 2
+          "step": 10
         }
       ],
       "thresholds": [],
@@ -1854,6 +1965,7 @@
       "timeShift": null,
       "title": "Process Page Memory Usage",
       "tooltip": {
+        "msResolution": false,
         "shared": true,
         "sort": 0,
         "value_type": "individual"
@@ -1868,15 +1980,14 @@
       },
       "yaxes": [
         {
-          "format": "decbytes",
+          "format": "bytes",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": 0,
           "show": true
         },
         {
-          "decimals": null,
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1896,34 +2007,42 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "PrometheusProcessExporter",
-      "decimals": 0,
-      "description": "",
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
+      "grid": {},
       "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 47
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 37
       },
       "hiddenSeries": false,
-      "id": 25,
+      "id": 29,
+      "isNew": true,
       "legend": {
         "alignAsTable": true,
-        "avg": true,
+        "avg": false,
         "current": true,
-        "max": true,
+        "hideEmpty": false,
+        "hideZero": false,
+        "max": false,
         "min": false,
-        "rightSide": true,
+        "rightSide": false,
         "show": true,
         "sideWidth": null,
-        "sort": "max",
-        "sortDesc": true,
         "total": false,
         "values": true
       },
       "lines": true,
-      "linewidth": 1,
+      "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
       "options": {
@@ -1939,13 +2058,13 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"$processes\", instance=\"$server:9256\"}) by (groupname)",
-          "format": "time_series",
+          "expr": "sum(namedprocess_namegroup_num_procs{groupname=~\"$processes\", instance=~\"$server:9256\"}) by (groupname,instance)",
           "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "{{groupname}}",
+          "intervalFactor": 1,
+          "legendFormat": "{{instance}} | {{groupname}}",
+          "metric": "process_namegroup_num_procs",
           "refId": "A",
-          "step": 2
+          "step": 10
         }
       ],
       "thresholds": [],
@@ -1954,6 +2073,7 @@
       "timeShift": null,
       "title": "Number of Processes In Group",
       "tooltip": {
+        "msResolution": false,
         "shared": true,
         "sort": 0,
         "value_type": "individual"
@@ -1968,7 +2088,6 @@
       },
       "yaxes": [
         {
-          "decimals": null,
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1977,215 +2096,12 @@
           "show": true
         },
         {
-          "decimals": null,
           "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "PrometheusProcessExporter",
-      "decimals": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 53
-      },
-      "hiddenSeries": false,
-      "id": 26,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "sideWidth": null,
-        "sort": "max",
-        "sortDesc": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(namedprocess_namegroup_read_bytes_total{groupname=~\"$processes\", instance=\"$server:9256\"}[$interval])",
-          "format": "time_series",
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "{{groupname}}",
-          "refId": "A",
-          "step": 2
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Process Read Bytes",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "KBs",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "decimals": null,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "PrometheusProcessExporter",
-      "decimals": 0,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 59
-      },
-      "hiddenSeries": false,
-      "id": 27,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "sideWidth": 750,
-        "sort": "max",
-        "sortDesc": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(namedprocess_namegroup_write_bytes_total{groupname=~\"$processes\", instance=\"$server:9256\"}[$interval])",
-          "format": "time_series",
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "{{groupname}}",
-          "refId": "A",
-          "step": 2
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Process Write Bytes",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "KBs",
           "label": null,
           "logBase": 1,
           "max": null,
           "min": null,
           "show": true
-        },
-        {
-          "decimals": null,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
         }
       ],
       "yaxis": {
@@ -2195,7 +2111,7 @@
     }
   ],
   "refresh": "1m",
-  "schemaVersion": 21,
+  "schemaVersion": 25,
   "style": "dark",
   "tags": [
     "prometheus"
@@ -2205,9 +2121,9 @@
       {
         "allValue": null,
         "current": {
-          "tags": [],
-          "text": "28.0.2.13",
-          "value": "28.0.2.13"
+          "selected": false,
+          "text": "28.0.2.25",
+          "value": "28.0.2.25"
         },
         "datasource": "Prometheus",
         "definition": "label_values(node_boot_time_seconds,instance)",
@@ -2234,15 +2150,15 @@
         "auto_min": "10s",
         "current": {
           "selected": false,
-          "text": "1m",
-          "value": "1m"
+          "text": "10m",
+          "value": "10m"
         },
         "hide": 0,
         "label": null,
         "name": "interval",
         "options": [
           {
-            "selected": true,
+            "selected": false,
             "text": "1m",
             "value": "1m"
           },
@@ -2252,7 +2168,7 @@
             "value": "5m"
           },
           {
-            "selected": false,
+            "selected": true,
             "text": "10m",
             "value": "10m"
           },
@@ -2298,6 +2214,7 @@
           }
         ],
         "query": "1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
+        "queryValue": "",
         "refresh": 2,
         "skipUrlSync": false,
         "type": "interval"
@@ -2305,14 +2222,17 @@
       {
         "allValue": null,
         "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
+          "selected": true,
+          "tags": [],
+          "text": "/usr/share/filebeat/bin/filebeat | root",
+          "value": [
+            "/usr/share/filebeat/bin/filebeat | root"
+          ]
         },
         "datasource": "PrometheusProcessExporter",
         "definition": "label_values(namedprocess_namegroup_cpu_seconds_total{instance=\"$server:9256\"}, groupname)",
         "hide": 0,
-        "includeAll": true,
+        "includeAll": false,
         "label": null,
         "multi": true,
         "name": "processes",
@@ -2336,7 +2256,6 @@
   },
   "timepicker": {
     "refresh_intervals": [
-      "5s",
       "10s",
       "30s",
       "1m",
@@ -2362,5 +2281,5 @@
   "timezone": "browser",
   "title": "Host Details",
   "uid": "mrXQlqCZz",
-  "version": 40
-}
+  "version": 1
+}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/monitoring/dashboards/dashboards/process-exporter.json b/kubernetes/helm_charts/monitoring/dashboards/dashboards/process-exporter.json
index e3b144d66..9f297fead 100644
--- a/kubernetes/helm_charts/monitoring/dashboards/dashboards/process-exporter.json
+++ b/kubernetes/helm_charts/monitoring/dashboards/dashboards/process-exporter.json
@@ -16,8 +16,8 @@
   "editable": true,
   "gnetId": 249,
   "graphTooltip": 1,
-  "id": 58,
-  "iteration": 1587139046794,
+  "id": 122,
+  "iteration": 1611314228618,
   "links": [
     {
       "asDropdown": true,
@@ -41,6 +41,12 @@
       "decimals": 2,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "grid": {},
@@ -143,6 +149,12 @@
       "decimals": 2,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "grid": {},
@@ -242,6 +254,12 @@
       "decimals": 2,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "grid": {},
@@ -342,6 +360,12 @@
       "datasource": "PrometheusProcessExporter",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "grid": {},
@@ -443,6 +467,12 @@
       "datasource": "PrometheusProcessExporter",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "grid": {},
@@ -541,6 +571,12 @@
       "datasource": "PrometheusProcessExporter",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "grid": {},
@@ -633,7 +669,7 @@
     }
   ],
   "refresh": "1m",
-  "schemaVersion": 21,
+  "schemaVersion": 25,
   "style": "dark",
   "tags": [
     "OS"
@@ -720,15 +756,18 @@
       {
         "allValue": null,
         "current": {
-          "text": "28.0.2.25:9256",
-          "value": "28.0.2.25:9256"
+          "selected": true,
+          "text": "28.0.2.8:9256",
+          "value": [
+            "28.0.2.8:9256"
+          ]
         },
         "datasource": "PrometheusProcessExporter",
         "definition": "label_values(namedprocess_namegroup_cpu_seconds_total{job=\"process-exporter\"},instance)",
         "hide": 0,
         "includeAll": false,
         "label": null,
-        "multi": false,
+        "multi": true,
         "name": "instance",
         "options": [],
         "query": "label_values(namedprocess_namegroup_cpu_seconds_total{job=\"process-exporter\"},instance)",
@@ -776,7 +815,6 @@
   },
   "timepicker": {
     "refresh_intervals": [
-      "5s",
       "10s",
       "30s",
       "1m",
@@ -802,5 +840,5 @@
   "timezone": "browser",
   "title": "Process Exporter",
   "uid": "z7D_C1CWz",
-  "version": 8
-}
+  "version": 1
+}
\ No newline at end of file

From 406157fe881a5fe35f0022fc4a16ca101fa29d5c Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 28 Jan 2021 16:41:07 +0530
Subject: [PATCH 150/184] feat: TG-733 updating logging jenkinsfile (#2189)

* fix: updating logging jenkinsfile

* fix: remove unnecessary file

* fix: adding jenkins jobs for filebeats
---
 ansible/roles/vm-agents-filebeat/README.md    |  83 ---
 .../vm-agents-filebeat/handlers/main.yml      |  12 -
 .../roles/vm-agents-filebeat/library/yumrepo  | 560 ------------------
 .../roles/vm-agents-filebeat/meta/main.yml    |  17 -
 .../roles/vm-agents-filebeat/tasks/darwin.yml |  17 -
 .../roles/vm-agents-filebeat/tasks/debian.yml |  17 -
 .../roles/vm-agents-filebeat/tasks/redhat.yml |  19 -
 .../Core/jobs/LoggingFileBeatsVM/config.xml   | 175 ++++++
 .../jobs/LoggingFileBeatsVM/config.xml        | 175 ++++++
 .../jobs/LoggingFileBeatsVM/config.xml        | 175 ++++++
 pipelines/deploy/logger/Jenkinsfile           |   4 +-
 11 files changed, 527 insertions(+), 727 deletions(-)
 delete mode 100644 ansible/roles/vm-agents-filebeat/README.md
 delete mode 100644 ansible/roles/vm-agents-filebeat/handlers/main.yml
 delete mode 100755 ansible/roles/vm-agents-filebeat/library/yumrepo
 delete mode 100644 ansible/roles/vm-agents-filebeat/meta/main.yml
 delete mode 100644 ansible/roles/vm-agents-filebeat/tasks/darwin.yml
 delete mode 100644 ansible/roles/vm-agents-filebeat/tasks/debian.yml
 delete mode 100644 ansible/roles/vm-agents-filebeat/tasks/redhat.yml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggingFileBeatsVM/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml

diff --git a/ansible/roles/vm-agents-filebeat/README.md b/ansible/roles/vm-agents-filebeat/README.md
deleted file mode 100644
index 4c9d226b5..000000000
--- a/ansible/roles/vm-agents-filebeat/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-Ansible Filebeat role
-=========
-
-[![Ansible Galaxy](https://img.shields.io/badge/galaxy-DavidWittman.filebeat-blue.svg?style=flat)](https://galaxy.ansible.com/detail#/role/6293) [![Travis](https://travis-ci.org/DavidWittman/ansible-filebeat.svg?branch=master)](https://travis-ci.org/DavidWittman/ansible-filebeat)
-
-Installs Elastic's Filebeat for forwarding logs.
-
-Role Variables
---------------
-
- - `filebeat_version` - The version of filebeat to install. Defaults to `1.3.1`.
- - `filebeat_config` - YAML representation of your filebeat config. This is templated directly into the configuration file as YAML. See the [example configuration](https://github.com/elastic/beats/blob/master/filebeat/filebeat.full.yml) for an exhaustive list of configuration options. Defaults to:
-
-  ``` yaml
-  filebeat_config:
-    filebeat:
-      prospectors:
-        - paths:
-            - /var/log/messages
-            - /var/log/*.log
-          input_type: log
-    output:
-      file:
-        path: /tmp/filebeat
-        filename: filebeat
-    logging:
-      to_syslog: true
-      level: error
-  ```
- - `filebeat_ca_cert` - If provided, the contents of this variable will be placed into the file identified by `filebeat_ca_path` on the target host. You can then include the `filebeat_ca_path` within your configuration to properly authenticate your TLS connections to Logstash/Elasticsearch/etc.
- 
-  If you wish to load your CA certificate from a file, use the `file` lookup plugin, e.g.:
-  ``` yaml
-  filebeat_ca_cert: "{{ lookup('file', '/path/to/ca.crt') }}"
-  ```
- - `filebeat_ca_path` - If a CA certificate is provided in `filebeat_ca_cert`, it will be created at this path. 
-
-Similar to the CA variables, you can upload SSL certificates and keys for filebeat using these variables:
-
- - `filebeat_ssl_cert` - Contents of the SSL certificate
- - `filebeat_ssl_cert_path` - Destination of the certificate on the Ansible controlled host
- - `filebeat_ssl_key` - Contents of the SSL key
- - `filebeat_ssl_key_path` - Destination of the SSL key on the Ansible controlled host
-
-You can also store the config in separate `filebeat.yml` file and include it using [lookup](http://docs.ansible.com/ansible/playbooks_lookups.html#intro-to-lookups-getting-file-contents):
-
-``` yaml
-filebeat_config: "{{ lookup('file', './filebeat.yml')|from_yaml }}"
-```
-
-Common Configurations
----------------------
-
-Connecting to Elasticsearch:
-
-  ``` yaml
-  filebeat_config:
-    filebeat:
-      prospectors:
-        - paths:
-            - /var/log/messages
-            - /var/log/*.log
-          input_type: log
-    output:
-      elasticsearch:
-        hosts:
-          - "http://localhost:9200"
-        username: "bob"
-        password: "12345"
-    logging:
-      to_syslog: true
-      level: error
-  ```
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-David Wittman
diff --git a/ansible/roles/vm-agents-filebeat/handlers/main.yml b/ansible/roles/vm-agents-filebeat/handlers/main.yml
deleted file mode 100644
index 8c75d6516..000000000
--- a/ansible/roles/vm-agents-filebeat/handlers/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: restart filebeat
-  service:
-    name: filebeat
-    state: restarted
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'Debian'
-
-- name: restart filebeat
-  command: ./filebeat -c filebeat.yml -d "publish"
-  args:
-    chdir: "{{filebeat.base_path}}"
-  when: ansible_os_family == 'Darwin'
\ No newline at end of file
diff --git a/ansible/roles/vm-agents-filebeat/library/yumrepo b/ansible/roles/vm-agents-filebeat/library/yumrepo
deleted file mode 100755
index e2052cea1..000000000
--- a/ansible/roles/vm-agents-filebeat/library/yumrepo
+++ /dev/null
@@ -1,560 +0,0 @@
-#!/usr/bin/python
-# encoding: utf-8
-
-# (c) 2015, Jiri Tyr <jiri.tyr@gmail.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-
-
-import ConfigParser
-import os
-
-
-DOCUMENTATION = '''
----
-module: yumrepo
-author: Jiri Tyr (@jtyr)
-version_added: '2.0'
-short_description: Add and remove YUM repositories
-description:
-  - Add or remove YUM repositories in RPM-based Linux distributions.
-
-options:
-  bandwidth:
-    required: false
-    default: 0
-    description:
-      - Maximum available network bandwidth in bytes/second. Used with the
-        I(throttle) option.
-      - If I(throttle) is a percentage and bandwidth is C(0) then bandwidth
-        throttling will be disabled. If I(throttle) is expressed as a data rate
-        (bytes/sec) then this option is ignored. Default is C(0) (no bandwidth
-        throttling).
-  baseurl:
-    required: false
-    default: None
-    description:
-      - URL to the directory where the yum repository's 'repodata' directory
-        lives.
-      - This or the I(mirrorlist) parameter is required.
-  cost:
-    required: false
-    default: 1000
-    description:
-      - Relative cost of accessing this repository. Useful for weighing one
-        repo's packages as greater/less than any other.
-  description:
-    required: false
-    default: None
-    description:
-      - A human readable string describing the repository.
-  enabled:
-    required: false
-    choices: ['yes', 'no']
-    default: 'yes'
-    description:
-      - This tells yum whether or not use this repository.
-  enablegroups:
-    required: false
-    choices: ['yes', 'no']
-    default: 'yes'
-    description:
-      - Determines whether yum will allow the use of package groups for this
-        repository.
-  exclude:
-    required: false
-    default: None
-    description:
-      - List of packages to exclude from updates or installs. This should be a
-        space separated list. Shell globs using wildcards (eg. C(*) and C(?))
-        are allowed.
-      - The list can also be a regular YAML array.
-  failovermethod:
-    required: false
-    choices: [roundrobin, priority]
-    default: roundrobin
-    description:
-      - C(roundrobin) randomly selects a URL out of the list of URLs to start
-        with and proceeds through each of them as it encounters a failure
-        contacting the host.
-      - C(priority) starts from the first baseurl listed and reads through them
-        sequentially.
-  file:
-    required: false
-    default: None
-    description:
-      - File to use to save the repo in. Defaults to the value of I(name).
-  gpgcakey:
-    required: false
-    default: None
-    description:
-      - A URL pointing to the ASCII-armored CA key file for the repository.
-  gpgcheck:
-    required: false
-    choices: ['yes', 'no']
-    default: 'no'
-    description:
-      - Tells yum whether or not it should perform a GPG signature check on
-        packages.
-  gpgkey:
-    required: false
-    default: None
-    description:
-      - A URL pointing to the ASCII-armored GPG key file for the repository.
-  http_caching:
-    required: false
-    choices: [all, packages, none]
-    default: all
-    description:
-      - Determines how upstream HTTP caches are instructed to handle any HTTP
-        downloads that Yum does.
-      - C(all) means that all HTTP downloads should be cached.
-      - C(packages) means that only RPM package downloads should be cached (but
-         not repository metadata downloads).
-      - C(none) means that no HTTP downloads should be cached.
-  includepkgs:
-    required: false
-    default: None
-    description:
-      - List of packages you want to only use from a repository. This should be
-        a space separated list. Shell globs using wildcards (eg. C(*) and C(?))
-        are allowed. Substitution variables (e.g. C($releasever)) are honored
-        here.
-      - The list can also be a regular YAML array.
-  keepalive:
-    required: false
-    choices: ['yes', 'no']
-    default: 'no'
-    description:
-      - This tells yum whether or not HTTP/1.1 keepalive should be used with
-        this repository. This can improve transfer speeds by using one
-        connection when downloading multiple files from a repository.
-  metadata_expire:
-    required: false
-    default: 21600
-    description:
-      - Time (in seconds) after which the metadata will expire.
-      - Default value is 6 hours.
-  metalink:
-    required: false
-    default: None
-    description:
-      - Specifies a URL to a metalink file for the repomd.xml, a list of
-        mirrors for the entire repository are generated by converting the
-        mirrors for the repomd.xml file to a baseurl.
-  mirrorlist:
-    required: false
-    default: None
-    description:
-      - Specifies a URL to a file containing a list of baseurls.
-      - This or the I(baseurl) parameter is required.
-  mirrorlist_expire:
-    required: false
-    default: 21600
-    description:
-      - Time (in seconds) after which the mirrorlist locally cached will
-        expire.
-      - Default value is 6 hours.
-  name:
-    required: true
-    description:
-      - Unique repository ID.
-  password:
-    required: false
-    default: None
-    description:
-      - Password to use with the username for basic authentication.
-  protect:
-    required: false
-    choices: ['yes', 'no']
-    default: 'no'
-    description:
-      - Protect packages from updates from other repositories.
-  proxy:
-    required: false
-    default: None
-    description:
-      - URL to the proxy server that yum should use.
-  proxy_password:
-    required: false
-    default: None
-    description:
-      - Username to use for proxy.
-  proxy_username:
-    required: false
-    default: None
-    description:
-      - Password for this proxy.
-  repo_gpgcheck:
-    required: false
-    choices: ['yes', 'no']
-    default: 'no'
-    description:
-      - This tells yum whether or not it should perform a GPG signature check
-        on the repodata from this repository.
-  reposdir:
-    required: false
-    default: /etc/yum.repos.d
-    description:
-      - Directory where the C(.repo) files will be stored.
-  retries:
-    required: false
-    default: 10
-    description:
-      - Set the number of times any attempt to retrieve a file should retry
-        before returning an error. Setting this to C(0) makes yum try forever.
-  skip_if_unavailable:
-    required: false
-    choices: ['yes', 'no']
-    default: 'no'
-    description:
-      - If set to C(yes) yum will continue running if this repository cannot be
-        contacted for any reason. This should be set carefully as all repos are
-        consulted for any given command.
-  sslcacert:
-    required: false
-    default: None
-    description:
-      - Path to the directory containing the databases of the certificate
-        authorities yum should use to verify SSL certificates.
-  ssl_check_cert_permissions:
-    required: false
-    choices: ['yes', 'no']
-    default: 'no'
-    description:
-      - Whether yum should check the permissions on the paths for the
-        certificates on the repository (both remote and local).
-      - If we can't read any of the files then yum will force
-        I(skip_if_unavailable) to be true. This is most useful for non-root
-        processes which use yum on repos that have client cert files which are
-        readable only by root.
-  sslclientcert:
-    required: false
-    default: None
-    description:
-      - Path to the SSL client certificate yum should use to connect to
-        repos/remote sites.
-  sslclientkey:
-    required: false
-    default: None
-    description:
-      - Path to the SSL client key yum should use to connect to repos/remote
-        sites.
-  sslverify:
-    required: false
-    choices: ['yes', 'no']
-    default: 'yes'
-    description:
-      - Defines whether yum should verify SSL certificates/hosts at all.
-  state:
-    required: false
-    choices: [absent, present]
-    default: present
-    description:
-      - A source string state.
-  throttle:
-    required: false
-    default: None
-    description:
-      - Enable bandwidth throttling for downloads.
-      - This option can be expressed as a absolute data rate in bytes/sec. An
-        SI prefix (k, M or G) may be appended to the bandwidth value.
-  timeout:
-    required: false
-    default: 30
-    description:
-      - Number of seconds to wait for a connection before timing out.
-  username:
-    required: false
-    default: None
-    description:
-      - Username to use for basic authentication to a repo or really any url.
-
-extends_documentation_fragment: files
-
-notes:
-  - All comments will be removed if modifying an existing repo file.
-  - Section order is preserved in an existing repo file.
-  - Parameters in a section are ordered alphabetically in an existing repo
-    file.
-  - The repo file will be automatically deleted if it contains no repository.
-'''
-
-EXAMPLES = '''
-- name: Add repository
-  yumrepo:
-    name: epel
-    description: EPEL YUM repo
-    baseurl: http://download.fedoraproject.org/pub/epel/$releasever/$basearch/
-
-- name: Add multiple repositories into the same file (1/2)
-  yumrepo:
-    name: epel
-    description: EPEL YUM repo
-    file: external_repos
-    baseurl: http://download.fedoraproject.org/pub/epel/$releasever/$basearch/
-    gpgcheck: no
-- name: Add multiple repositories into the same file (2/2)
-  yumrepo:
-    name: rpmforge
-    description: RPMforge YUM repo
-    file: external_repos
-    baseurl: http://apt.sw.be/redhat/el7/en/$basearch/rpmforge
-    mirrorlist: http://mirrorlist.repoforge.org/el7/mirrors-rpmforge
-    enabled: no
-
-- name: Remove repository
-  yumrepo:
-    name: epel
-    state: absent
-
-- name: Remove repository from a specific repo file
-  yumrepo:
-    name: epel
-    file: external_repos
-    state: absent
-'''
-
-RETURN = '''
-repo:
-    description: repository name
-    returned: success
-    type: string
-    sample: "epel"
-state:
-    description: state of the target, after execution
-    returned: success
-    type: string
-    sample: "present"
-'''
-
-
-class YumRepo(object):
-    # Class global variables
-    module = None
-    params = None
-    section = None
-    repofile = ConfigParser.RawConfigParser()
-
-    # List of parameters which will be allowed in the repo file output
-    allowed_params = [
-        'bandwidth', 'baseurl', 'cost', 'enabled', 'enablegroups', 'exclude',
-        'failovermethod', 'gpgcakey', 'gpgcheck', 'gpgkey', 'http_caching',
-        'includepkgs', 'keepalive', 'metadata_expire', 'metalink',
-        'mirrorlist', 'mirrorlist_expire', 'name', 'password', 'protect',
-        'proxy', 'proxy_password', 'proxy_username', 'repo_gpgcheck',
-        'retries', 'skip_if_unavailable', 'sslcacert',
-        'ssl_check_cert_permissions', 'sslclientcert', 'sslclientkey',
-        'sslverify', 'throttle', 'timeout', 'username']
-
-    # List of parameters which can be a list
-    list_params = ['exclude', 'includepkgs']
-
-    def __init__(self, module):
-        # To be able to use fail_json
-        self.module = module
-        # Shortcut for the params
-        self.params = self.module.params
-        # Section is always the repoid
-        self.section = self.params['repoid']
-
-        # Check if repo directory exists
-        repos_dir = self.params['reposdir']
-        if not os.path.isdir(repos_dir):
-            self.module.fail_json(
-                msg='Repo directory "%s" does not exist.' % repos_dir)
-
-        # Get the given or the default repo file name
-        repo_file = self.params['repoid']
-        if self.params['file'] is not None:
-            repo_file = self.params['file']
-
-        # Set dest; also used to set dest parameter for the FS attributes
-        self.params['dest'] = os.path.join(repos_dir, "%s.repo" % repo_file)
-
-        # Read the repo file if it exists
-        if os.path.isfile(self.params['dest']):
-            self.repofile.read(self.params['dest'])
-
-    def add(self):
-        # Remove already existing repo and create a new one
-        if self.repofile.has_section(self.section):
-            self.repofile.remove_section(self.section)
-
-        # Add section
-        self.repofile.add_section(self.section)
-
-        # Baseurl/mirrorlist is not required because for removal we need only
-        # the repo name. This is why we check if the baseurl/mirrorlist is
-        # defined.
-        if (self.params['baseurl'], self.params['mirrorlist']) == (None, None):
-            self.module.fail_json(
-                msg='Paramater "baseurl" or "mirrorlist" is required for '
-                'adding a new repo.')
-
-        # Set options
-        for key, value in sorted(self.params.items()):
-            if key in self.list_params and isinstance(value, list):
-                # Join items into one string for specific parameters
-                value = ' '.join(value)
-            elif isinstance(value, bool):
-                # Convert boolean value to integer
-                value = int(value)
-
-            # Set the value only if it was defined (default is None)
-            if value is not None and key in self.allowed_params:
-                self.repofile.set(self.section, key, value)
-
-    def save(self):
-        if len(self.repofile.sections()):
-            # Write data into the file
-            try:
-                fd = open(self.params['dest'], 'wb')
-            except IOError:
-                self.module.fail_json(
-                    msg='Cannot open repo file %s.' %
-                    self.params['dest'])
-
-            try:
-                try:
-                    self.repofile.write(fd)
-                except Error:
-                    self.module.fail_json(
-                        msg='Cannot write repo file %s.' %
-                        self.params['dest'])
-            finally:
-                fd.close()
-        else:
-            # Remove the file if there are not repos
-            try:
-                os.remove(self.params['dest'])
-            except OSError:
-                self.module.fail_json(
-                    msg='Cannot remove empty repo file %s.' %
-                    self.params['dest'])
-
-    def remove(self):
-        # Remove section if exists
-        if self.repofile.has_section(self.section):
-            self.repofile.remove_section(self.section)
-
-    def dump(self):
-        repo_string = ""
-
-        # Compose the repo file
-        for section in sorted(self.repofile.sections()):
-            repo_string += "[%s]\n" % section
-
-            for key, value in sorted(self.repofile.items(section)):
-                repo_string += "%s = %s\n" % (key, value)
-
-            repo_string += "\n"
-
-        return repo_string
-
-
-def main():
-    # Module settings
-    module = AnsibleModule(
-        argument_spec=dict(
-            bandwidth=dict(),
-            baseurl=dict(),
-            cost=dict(),
-            description=dict(),
-            enabled=dict(type='bool'),
-            enablegroups=dict(type='bool'),
-            exclude=dict(),
-            failovermethod=dict(choices=['roundrobin', 'priority']),
-            file=dict(),
-            gpgcakey=dict(),
-            gpgcheck=dict(type='bool'),
-            gpgkey=dict(),
-            http_caching=dict(choices=['all', 'packages', 'none']),
-            includepkgs=dict(),
-            keepalive=dict(type='bool'),
-            metadata_expire=dict(),
-            metalink=dict(),
-            mirrorlist=dict(),
-            mirrorlist_expire=dict(),
-            name=dict(required=True),
-            password=dict(no_log=True),
-            protect=dict(type='bool'),
-            proxy=dict(),
-            proxy_password=dict(no_log=True),
-            proxy_username=dict(),
-            repo_gpgcheck=dict(type='bool'),
-            reposdir=dict(default='/etc/yum.repos.d'),
-            retries=dict(),
-            skip_if_unavailable=dict(type='bool'),
-            sslcacert=dict(),
-            ssl_check_cert_permissions=dict(type='bool'),
-            sslclientcert=dict(),
-            sslclientkey=dict(),
-            sslverify=dict(type='bool'),
-            state=dict(choices=['present', 'absent'], default='present'),
-            throttle=dict(),
-            timeout=dict(),
-            username=dict(),
-        ),
-        add_file_common_args=True,
-        supports_check_mode=True,
-    )
-
-    name = module.params['name']
-    state = module.params['state']
-
-    # Rename "name" and "description" to ensure correct key sorting
-    module.params['repoid'] = module.params['name']
-    module.params['name'] = module.params['description']
-    del module.params['description']
-
-    # Instantiate the YumRepo object
-    yumrepo = YumRepo(module)
-
-    # Get repo status before change
-    yumrepo_before = yumrepo.dump()
-
-    # Perform action depending on the state
-    if state == 'present':
-        yumrepo.add()
-    elif state == 'absent':
-        yumrepo.remove()
-
-    # Get repo status after change
-    yumrepo_after = yumrepo.dump()
-
-    # Compare repo states
-    changed = yumrepo_before != yumrepo_after
-
-    # Save the file only if not in check mode and if there was a change
-    if not module.check_mode and changed:
-        yumrepo.save()
-
-    # Change file attributes if needed
-    if os.path.isfile(module.params['dest']):
-        file_args = module.load_file_common_arguments(module.params)
-        changed = module.set_fs_attributes_if_different(file_args, changed)
-
-    # Print status of the change
-    module.exit_json(changed=changed, repo=name, state=state)
-
-
-# Import module snippets
-from ansible.module_utils.basic import *
-
-
-if __name__ == '__main__':
-    main()
diff --git a/ansible/roles/vm-agents-filebeat/meta/main.yml b/ansible/roles/vm-agents-filebeat/meta/main.yml
deleted file mode 100644
index 6343b7965..000000000
--- a/ansible/roles/vm-agents-filebeat/meta/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-galaxy_info:
-  author: David Wittman
-  description: Installs Elastic's Filebeat for forwarding logs.
-  license: BSD
-  min_ansible_version: 1.2
-  platforms:
-  - name: EL
-    versions:
-    - all
-  - name: Ubuntu
-    versions:
-    - all
-  categories:
-  - monitoring
-  - system
-dependencies: []
diff --git a/ansible/roles/vm-agents-filebeat/tasks/darwin.yml b/ansible/roles/vm-agents-filebeat/tasks/darwin.yml
deleted file mode 100644
index dfccae57e..000000000
--- a/ansible/roles/vm-agents-filebeat/tasks/darwin.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: download filebeat
-  get_url: 
-    url: https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-5.5.1-darwin-x86_64.tar.gz
-    checksum: md5:6297ad27d6ddea291a4594b199d2fa21
-    dest: /tmp/filebeat.tar.gz
-
-- unarchive:
-    src: /tmp/filebeat.tar.gz
-    dest: /tmp/
-
-- file: 
-    path: /tmp/filebeat
-    state: absent
-
-- name: copying over
-  command: mv /tmp/filebeat-5.5.1-darwin-x86_64 /tmp/filebeat
\ No newline at end of file
diff --git a/ansible/roles/vm-agents-filebeat/tasks/debian.yml b/ansible/roles/vm-agents-filebeat/tasks/debian.yml
deleted file mode 100644
index c48d58e4e..000000000
--- a/ansible/roles/vm-agents-filebeat/tasks/debian.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: add elastic gpg key
-  apt_key:
-    url: "{{ filebeat_gpg_url }}"
-
-- name: add beats repository
-  apt_repository:
-    repo: "{{ filebeat_apt_repo }}"
-    state: present
-    update_cache: yes
-
-- name: install filebeat
-  apt:
-    name: filebeat={{ filebeat_version }}
-    state: present
-  notify:
-    - restart filebeat
diff --git a/ansible/roles/vm-agents-filebeat/tasks/redhat.yml b/ansible/roles/vm-agents-filebeat/tasks/redhat.yml
deleted file mode 100644
index f125b785d..000000000
--- a/ansible/roles/vm-agents-filebeat/tasks/redhat.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: add rpm key for elastic.co
-  rpm_key:
-    key: "{{ filebeat_gpg_url }}"
-
-- name: create beats yum repo
-  yumrepo:
-    name: beats
-    baseurl: "{{ filebeat_repo_url }}"
-    enabled: yes
-    gpgcheck: yes
-    gpgkey: "{{ filebeat_gpg_url }}"
-
-- name: install filebeat
-  yum:
-    name: "filebeat-{{ filebeat_version }}"
-    state: present
-  notify:
-    - restart filebeat
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggingFileBeatsVM/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggingFileBeatsVM/config.xml
new file mode 100644
index 000000000..6d70dacf0
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggingFileBeatsVM/config.xml
@@ -0,0 +1,175 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-6494533480752662</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-6494533482836034</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.ChoiceParameter plugin="uno-choice@2.5.1">
+          <name>hosts</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the host groups to deploy filbeat. You can add additonal host groups if you have more or different group names&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-6494533485540097</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>return ['cassandra',
+'composite-search-cluster',
+'dial',
+'dp-cassandra',
+'dp-redis',
+'es',
+'influxdb',
+'ingestion-cluster-kafka',
+'ingestion-cluster-zookeeper',
+'kafka-indexer',
+'keycloak',
+'learningall',
+'learning-neo4j-cluster',
+'lms-redis',
+'log-es',
+'lp-cassandra',
+'lp-redis',
+'postgres',
+'processing-cluster-kafka',
+'redis-metadata',
+'secor',
+'spark',
+'telemetry-indexer-logstash',
+'zookeeper']</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <choiceType>PT_MULTI_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.ChoiceParameter>
+        <org.biouno.unochoice.ChoiceParameter plugin="uno-choice@2.5.1">
+          <name>tags</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Select this only if you want to start or stop. Use default for deploying filebeat&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-6563905181834747</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>return['default',
+'start-filebeat',
+'stop-filebeat']</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.ChoiceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/logger/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml
new file mode 100644
index 000000000..6d70dacf0
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml
@@ -0,0 +1,175 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-6494533480752662</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-6494533482836034</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.ChoiceParameter plugin="uno-choice@2.5.1">
+          <name>hosts</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the host groups to deploy filbeat. You can add additonal host groups if you have more or different group names&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-6494533485540097</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>return ['cassandra',
+'composite-search-cluster',
+'dial',
+'dp-cassandra',
+'dp-redis',
+'es',
+'influxdb',
+'ingestion-cluster-kafka',
+'ingestion-cluster-zookeeper',
+'kafka-indexer',
+'keycloak',
+'learningall',
+'learning-neo4j-cluster',
+'lms-redis',
+'log-es',
+'lp-cassandra',
+'lp-redis',
+'postgres',
+'processing-cluster-kafka',
+'redis-metadata',
+'secor',
+'spark',
+'telemetry-indexer-logstash',
+'zookeeper']</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <choiceType>PT_MULTI_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.ChoiceParameter>
+        <org.biouno.unochoice.ChoiceParameter plugin="uno-choice@2.5.1">
+          <name>tags</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Select this only if you want to start or stop. Use default for deploying filebeat&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-6563905181834747</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>return['default',
+'start-filebeat',
+'stop-filebeat']</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.ChoiceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/logger/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml
new file mode 100644
index 000000000..6d70dacf0
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml
@@ -0,0 +1,175 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-6494533480752662</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-6494533482836034</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>true</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.ChoiceParameter plugin="uno-choice@2.5.1">
+          <name>hosts</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the host groups to deploy filbeat. You can add additonal host groups if you have more or different group names&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-6494533485540097</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>return ['cassandra',
+'composite-search-cluster',
+'dial',
+'dp-cassandra',
+'dp-redis',
+'es',
+'influxdb',
+'ingestion-cluster-kafka',
+'ingestion-cluster-zookeeper',
+'kafka-indexer',
+'keycloak',
+'learningall',
+'learning-neo4j-cluster',
+'lms-redis',
+'log-es',
+'lp-cassandra',
+'lp-redis',
+'postgres',
+'processing-cluster-kafka',
+'redis-metadata',
+'secor',
+'spark',
+'telemetry-indexer-logstash',
+'zookeeper']</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <choiceType>PT_MULTI_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.ChoiceParameter>
+        <org.biouno.unochoice.ChoiceParameter plugin="uno-choice@2.5.1">
+          <name>tags</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Select this only if you want to start or stop. Use default for deploying filebeat&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-6563905181834747</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>return['default',
+'start-filebeat',
+'stop-filebeat']</script>
+              <sandbox>true</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>LoggingFileBeatsVM</projectName>
+          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <choiceType>PT_SINGLE_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.ChoiceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/deploy/logger/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
diff --git a/pipelines/deploy/logger/Jenkinsfile b/pipelines/deploy/logger/Jenkinsfile
index 8050acc85..e5b8d17ef 100644
--- a/pipelines/deploy/logger/Jenkinsfile
+++ b/pipelines/deploy/logger/Jenkinsfile
@@ -25,8 +25,8 @@ node() {
                 module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim()
                 jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
                 ansiblePlaybook = "${currentWs}/ansible/logging.yml"
-                ansibleExtraArgs = "--tags ${params.tag} --vault-password-file /var/lib/jenkins/secrets/vault-pass -v"
-		values.put('currentWs', currentWs)
+		ansibleExtraArgs = "--tags ${params.tags} --extra-vars \"hosts=${params.hosts} tags=${params.tags}\" --vault-password-file /var/lib/jenkins/secrets/vault-pass --timeout 2"
+                values.put('currentWs', currentWs)
                 values.put('env', envDir)
                 values.put('module', module)
                 values.put('jobName', jobName)

From 3a69474b32a6592a159e890ceda3b4bb2cb7d2c5 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 28 Jan 2021 20:06:02 +0530
Subject: [PATCH 151/184] feat: role cleanup, rename roles and instance names
 (#2190)

* fix: role cleanup, rename roles and instance names

* fix set node name only when not defined in inventory

* fix: adding retry and delay for post task
---
 ansible/esupgrade.yml                         |   7 -
 ...upgradelatest.yml => provision-log-es.yml} |   5 +-
 ansible/provision.yml                         |  11 -
 ansible/registry_logging.yml                  |  11 -
 .../defaults/main.yml                         |   3 -
 .../meta/main.yml                             |   3 -
 .../tasks/main.yml                            |   2 -
 .../roles/elasticsearch_old/defaults/main.yml |  57 --
 .../roles/elasticsearch_old/handlers/main.yml |   8 -
 .../roles/elasticsearch_old/tasks/debian.yml  |  25 -
 .../roles/elasticsearch_old/tasks/main.yml    |  75 ---
 .../roles/elasticsearch_old/tasks/redhat.yml  |  14 -
 .../elasticsearch_old/templates/elasticsearch |  67 ---
 .../templates/elasticsearch.yml               | 493 ------------------
 .../elasticsearch_old/templates/logging.yml   |  67 ---
 ansible/roles/elasticsearch_old/vars/main.yml |   7 -
 ansible/roles/esUpgrade/defaults/main.yml     |  27 -
 ansible/roles/esUpgrade/meta/main.yml         |  29 --
 ansible/roles/esUpgrade/tasks/main.yml        |   2 -
 .../{LogEsUpgrade6xx => LogES}/config.xml     |   2 +-
 .../provision/log-es-upgrade/Jenkinsfile      |   2 +-
 .../log-es-upgrade/Jenkinsfile.latest         |  51 --
 22 files changed, 6 insertions(+), 962 deletions(-)
 delete mode 100644 ansible/esupgrade.yml
 rename ansible/{esupgradelatest.yml => provision-log-es.yml} (92%)
 delete mode 100755 ansible/roles/application_logger_elasticsearch/defaults/main.yml
 delete mode 100755 ansible/roles/application_logger_elasticsearch/meta/main.yml
 delete mode 100644 ansible/roles/application_logger_elasticsearch/tasks/main.yml
 delete mode 100644 ansible/roles/elasticsearch_old/defaults/main.yml
 delete mode 100644 ansible/roles/elasticsearch_old/handlers/main.yml
 delete mode 100644 ansible/roles/elasticsearch_old/tasks/debian.yml
 delete mode 100644 ansible/roles/elasticsearch_old/tasks/main.yml
 delete mode 100644 ansible/roles/elasticsearch_old/tasks/redhat.yml
 delete mode 100644 ansible/roles/elasticsearch_old/templates/elasticsearch
 delete mode 100644 ansible/roles/elasticsearch_old/templates/elasticsearch.yml
 delete mode 100644 ansible/roles/elasticsearch_old/templates/logging.yml
 delete mode 100644 ansible/roles/elasticsearch_old/vars/main.yml
 delete mode 100755 ansible/roles/esUpgrade/defaults/main.yml
 delete mode 100755 ansible/roles/esUpgrade/meta/main.yml
 delete mode 100644 ansible/roles/esUpgrade/tasks/main.yml
 rename deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/{LogEsUpgrade6xx => LogES}/config.xml (98%)
 delete mode 100644 pipelines/provision/log-es-upgrade/Jenkinsfile.latest

diff --git a/ansible/esupgrade.yml b/ansible/esupgrade.yml
deleted file mode 100644
index b213e8213..000000000
--- a/ansible/esupgrade.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- hosts: es-upgrade
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml']
-  roles:
-    - openjdk
-    - esUpgrade
diff --git a/ansible/esupgradelatest.yml b/ansible/provision-log-es.yml
similarity index 92%
rename from ansible/esupgradelatest.yml
rename to ansible/provision-log-es.yml
index d14ea66e0..d845b2f72 100644
--- a/ansible/esupgradelatest.yml
+++ b/ansible/provision-log-es.yml
@@ -5,7 +5,8 @@
   pre_tasks:
     - name: Registering node name
       set_fact:
-        es_instance_name: "{% for servername in play_hosts %}{% if inventory_hostname==servername %}es-{{ loop.index }}{% endif %}{% endfor %}"
+        es_instance_name: "{% for servername in play_hosts %}{% if inventory_hostname==servername %}log-es-{{ loop.index }}{% endif %}{% endfor %}"
+      when: es_instance_name is not defined
   roles:
     - openjdk
     - { role: log-es6,
@@ -51,3 +52,5 @@
         method: PUT
         return_content: true
         timeout: 30
+        retries: 3
+        delay: 10
diff --git a/ansible/provision.yml b/ansible/provision.yml
index b85eeaad5..9e2f91b06 100644
--- a/ansible/provision.yml
+++ b/ansible/provision.yml
@@ -36,17 +36,6 @@
   tags:
     - es
 
-- hosts: log-es
-  gather_facts: true
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - openjdk
-    - application_logger_elasticsearch
-  tags:
-    - log-es
-
 - hosts: postgresql-master
   become: yes
   vars_files:
diff --git a/ansible/registry_logging.yml b/ansible/registry_logging.yml
index 4df3e4466..ed699a312 100644
--- a/ansible/registry_logging.yml
+++ b/ansible/registry_logging.yml
@@ -6,14 +6,3 @@
     - stack-logger
   tags:
     - stack-logger
-
-- hosts: log-es
-  become: yes
-  vars_files:
-    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - openjdk
-    - application_logger_elasticsearch
-  tags:
-    - log-es
-
diff --git a/ansible/roles/application_logger_elasticsearch/defaults/main.yml b/ansible/roles/application_logger_elasticsearch/defaults/main.yml
deleted file mode 100755
index a014f35e9..000000000
--- a/ansible/roles/application_logger_elasticsearch/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-es_plugins:
-  - name: cloud-azure
-es_plugins_reinstall: true
diff --git a/ansible/roles/application_logger_elasticsearch/meta/main.yml b/ansible/roles/application_logger_elasticsearch/meta/main.yml
deleted file mode 100755
index d52b5ac2b..000000000
--- a/ansible/roles/application_logger_elasticsearch/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies: 
-  - elasticsearch_old
diff --git a/ansible/roles/application_logger_elasticsearch/tasks/main.yml b/ansible/roles/application_logger_elasticsearch/tasks/main.yml
deleted file mode 100644
index 53722e54e..000000000
--- a/ansible/roles/application_logger_elasticsearch/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- debug: msg="ES version={{es_version}}"
diff --git a/ansible/roles/elasticsearch_old/defaults/main.yml b/ansible/roles/elasticsearch_old/defaults/main.yml
deleted file mode 100644
index 32f111f44..000000000
--- a/ansible/roles/elasticsearch_old/defaults/main.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-# Elasticsearch release and version to install
-es_release: "2.4"
-es_minor_release: "5"
-es_user: elasticsearch
-es_logging_level: INFO
-es_etc_path_data: /var/lib/elasticsearch
-es_default_max_open_files: 65535
-es_etc_index_number_of_shards: 1
-es_version: "{{ es_release }}.{{es_minor_release}}"
-backup_storage_name:
-backup_storage_key:
-# Wait for elasticsearch to be listening for connections before proceeding
-# (e.g. after install / restart)
-es_wait_for_listen: yes
-es_etc_network_host: 0.0.0.0
-
-# Plugins to install, specified as:
-# - name: <plugin name, including optional version string>
-#   url: <optional url to download the plugin from>
-#   plugin_file: <optional plugin file to check if the plugin is installed>
-es_plugins: []
-
-
-# Other settings can be set here
-
-# Settings in /etc/defaults/elasticsearch, for example:
-# es_default_es_user: elasticsearch
-# es_default_es_group: elasticsearch
-#
-# See templates/elasticsearch for a full list and description of the settings
-# Additional settings not on the list can also be added like this:
-#
-# es_default:
-#   CUSTOM_VAR_ONE: 1
-#   CUSTOM_VAR_TWO: two
-#
-# This will become:
-#
-# CUSTOM_VAR_ONE=1
-# CUSTOM_VAR_TWO=two
-
-# Settings in /etc/elasticsearch/elasticsearch.yml, for example:
-# es_etc_cluster_name: elasticsearch
-# es_etc_index_number_of_shards: 3
-# See templates/elasticsearch.yml for a full list and description of the settings
-#
-# Additional settings not on the list can also be added like this:
-#
-# es_etc:
-#   http.max_header_size: 16kB
-#   transport.tcp.connect_timeout: 20s
-#
-# This will become:
-#
-# http.max_header_size: 16kB
-# transport.tcp.connect_timeout: 20s
diff --git a/ansible/roles/elasticsearch_old/handlers/main.yml b/ansible/roles/elasticsearch_old/handlers/main.yml
deleted file mode 100644
index db49efaf7..000000000
--- a/ansible/roles/elasticsearch_old/handlers/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Restart elasticsearch
-  service: name=elasticsearch state=restarted
-  notify: Wait for elasticsearch to be listening for connections
-
-- name: Wait for elasticsearch to be listening for connections
-  wait_for: port={{ es_etc_http_port | default(9200) }}
-  when: es_wait_for_listen
diff --git a/ansible/roles/elasticsearch_old/tasks/debian.yml b/ansible/roles/elasticsearch_old/tasks/debian.yml
deleted file mode 100644
index 8a375e384..000000000
--- a/ansible/roles/elasticsearch_old/tasks/debian.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- name: Add ElasticSearch repo public signing key
-  apt_key: id=46095ACC8548582C1A2699A9D27D666CD88E42B4 url=https://packages.elastic.co/GPG-KEY-elasticsearch state=present
-
-- name: Add ElasticSearch repository
-  apt_repository:
-    repo: 'deb http://packages.elasticsearch.org/elasticsearch/2.x/debian stable main'
-    state: present
-
-- name: Get information on the RAM
-  set_fact:
-    es_default_es_heap_size: "{% if ((ansible_memory_mb.real.total/(2*1024))|int) > 30000 %}26g{% else %}{{(((ansible_memory_mb.real.total/(2*1024))+1)|int)}}g{% endif %}"
-  when: es_default_es_heap_size is not defined
-
-
-- name: Copy /etc/default/elasticsearch
-  template: src=elasticsearch dest=/etc/default/elasticsearch
-  tags: update_es_config
-  notify: Restart elasticsearch
-
-- debug: msg="es_version={{es_version}}"
-
-- name: Install ElasticSearch
-  apt: name=elasticsearch={{ es_version }} state=present
-  notify: Restart elasticsearch
diff --git a/ansible/roles/elasticsearch_old/tasks/main.yml b/ansible/roles/elasticsearch_old/tasks/main.yml
deleted file mode 100644
index 0b234a1df..000000000
--- a/ansible/roles/elasticsearch_old/tasks/main.yml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-- include: debian.yml
-  when: ansible_os_family == "Debian"
-
-- include: redhat.yml
-  when: ansible_os_family == "RedHat"
-
-- name: Copy /etc/elasticsearch/elasticsearch.yml
-  template: src=elasticsearch.yml dest=/etc/elasticsearch/elasticsearch.yml
-  tags: update_es_config
-  notify: Restart elasticsearch
-
-- name: Creates data directory
-  file:
-    path={{ es_etc_path_data }}
-    state=directory
-    mode=755
-    owner={{ es_user }}
-    group={{ es_user }}
-
-- name: Creates scripts directory
-  file:
-    path={{ elasticsearch_config }}/scripts
-    state=directory
-    mode=755
-    owner={{ es_user }}
-    group={{ es_user }}
-
-- name: Copy logger file
-  template: src=logging.yml dest={{ elasticsearch_config }}/logging.yml
-  become: yes
-  tags: update_es_config
-  notify: Restart elasticsearch
-
-- name: Start ES service
-  service: name=elasticsearch state=started
-
-- name: Set elasticsearch service to start on boot
-  service: name=elasticsearch state=started
-
-- name: Remove plugins
-  command: bin/plugin remove {{item.name}}
-  args:
-    chdir: "{{ es_home }}"
-  with_items: "{{ es_plugins }}"
-  ignore_errors: yes
-  notify: Restart elasticsearch
-
-- name: Install azure plugin for elasticsearch
-  shell: ES_PATH_CONF=/etc/elasticsearch /usr/share/elasticsearch/bin/plugin install cloud-azure
-
-- name: Install plugins
-  command: bin/plugin install {{item.name}} {%if item.url is defined %} url {{item.url}}{% endif %}
-  args:
-    chdir: "{{ es_home }}"
-    creates: "{{ es_home }}/plugins/{{ item.plugin_file | default(item.name) }}"
-  with_items: "{{ es_plugins }}"
-  ignore_errors: yes
-  notify: Restart elasticsearch
-
-- name: Configure /etc/security/limits.conf
-  lineinfile: >
-    dest=/etc/security/limits.conf
-    line="{{ item.line }}"
-    state=present
-  with_items:
-    - { line: 'elasticsearch - nofile {{ es_default_max_open_files }}' }
-    - { line: 'elasticsearch - memlock unlimited' }
-    - { line: 'root - memlock unlimited' }
-  become: yes
-  notify: Restart elasticsearch
-
-- name: Start Elasticsearch
-  service: name=elasticsearch state=started 
-  become: yes
diff --git a/ansible/roles/elasticsearch_old/tasks/redhat.yml b/ansible/roles/elasticsearch_old/tasks/redhat.yml
deleted file mode 100644
index 45d095032..000000000
--- a/ansible/roles/elasticsearch_old/tasks/redhat.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Add ElasticSearch repo public signing key
-  rpm_key: key=https://packages.elastic.co/GPG-KEY-elasticsearch state=present
-
-- name: Add ElasticSearch repository
-  template: src=elasticsearch.repo dest=/etc/yum.repos.d/elasticsearch.repo
-
-- name: Copy /etc/sysconfig/elasticsearch
-  template: src=elasticsearch dest=/etc/sysconfig/elasticsearch
-  notify: Restart elasticsearch
-
-- name: Install ElasticSearch
-  yum: name=elasticsearch-{{ es_version }} state=present
-  notify: Restart elasticsearch
diff --git a/ansible/roles/elasticsearch_old/templates/elasticsearch b/ansible/roles/elasticsearch_old/templates/elasticsearch
deleted file mode 100644
index 508debb6c..000000000
--- a/ansible/roles/elasticsearch_old/templates/elasticsearch
+++ /dev/null
@@ -1,67 +0,0 @@
-# Run Elasticsearch as this user ID and group ID
-#ES_USER=elasticsearch
-{% if es_default_es_user is defined %}ES_USER={{ es_default_es_user }}{% endif %}
-
-#ES_GROUP=elasticsearch
-{% if es_default_es_group is defined %}ES_GROUP={{ es_default_es_group }}{% endif %}
-
-# Heap Size (defaults to 256m min, 1g max)
-#ES_HEAP_SIZE=2g
-{% if es_default_es_heap_size is defined %}ES_HEAP_SIZE={{ es_default_es_heap_size }}{% endif %}
-
-# Heap new generation
-#ES_HEAP_NEWSIZE=
-{% if es_default_es_heap_newsize is defined %}ES_HEAP_NEWSIZE={{ es_default_es_heap_newsize }}{% endif %}
-
-# max direct memory
-#ES_DIRECT_SIZE=
-{% if es_default_es_direct_size is defined %}ES_DIRECT_SIZE={{ es_default_es_direct_size }}{% endif %}
-
-# Maximum number of open files, defaults to 65535.
-#MAX_OPEN_FILES=65535
-{% if es_default_max_open_files is defined %}MAX_OPEN_FILES={{ es_default_max_open_files }}{% endif %}
-
-# Maximum locked memory size. Set to "unlimited" if you use the
-# bootstrap.mlockall option in es_yml. You must also set
-# ES_HEAP_SIZE.
-#MAX_LOCKED_MEMORY=unlimited
-{% if es_default_max_locked_memory is defined %}MAX_LOCKED_MEMORY={{ es_default_max_locked_memory }}{% endif %}
-
-# Maximum number of VMA (Virtual Memory Areas) a process can own
-#MAX_MAP_COUNT=262144
-{% if es_default_max_map_count is defined %}MAX_MAP_COUNT={{ es_default_max_map_count }}{% endif %}
-
-# Elasticsearch log directory
-#LOG_DIR=/var/log/elasticsearch
-{% if es_default_log_dir is defined %}LOG_DIR={{ es_default_log_dir }}{% endif %}
-
-# Elasticsearch data directory
-#DATA_DIR=/var/lib/elasticsearch
-{% if es_default_data_dir is defined %}DATA_DIR={{ es_default_data_dir }}{% endif %}
-
-# Elasticsearch work directory
-#WORK_DIR=/tmp/elasticsearch
-{% if es_default_work_dir is defined %}WORK_DIR={{ es_default_work_dir }}{% endif %}
-
-# Elasticsearch configuration directory
-#CONF_DIR=/etc/elasticsearch
-{% if es_default_conf_dir is defined %}CONF_DIR={{ es_default_conf_dir }}{% endif %}
-
-# Elasticsearch configuration file (es_yml)
-#CONF_FILE=/etc/elasticsearch/elasticsearch.yml
-{% if es_default_conf_file is defined %}CONF_FILE={{ es_default_conf_file }}{% endif %}
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=
-{% if es_default_es_java_opts is defined %}ES_JAVA_OPTS={{ es_default_es_java_opts }}{% endif %}
-
-# Configure restart on package upgrade (true, every other setting will lead to not restarting)
-#RESTART_ON_UPGRADE=true
-{% if es_default_restart_on_upgrade is defined %}RESTART_ON_UPGRADE={{ es_default_restart_on_upgrade }}{% endif %}
-
-# Additional variables
-{% if es_default is defined %}
-{% for key, value in es_default.iteritems() %}
-{{ key }}={{ value }}
-{% endfor %}
-{% endif %}
diff --git a/ansible/roles/elasticsearch_old/templates/elasticsearch.yml b/ansible/roles/elasticsearch_old/templates/elasticsearch.yml
deleted file mode 100644
index 832f06733..000000000
--- a/ansible/roles/elasticsearch_old/templates/elasticsearch.yml
+++ /dev/null
@@ -1,493 +0,0 @@
-##################### Elasticsearch Configuration Example #####################
-
-# This file contains an overview of various configuration settings,
-# targeted at operations staff. Application developers should
-# consult the guide at <http://elasticsearch.org/guide>.
-#
-# The installation procedure is covered at
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup.html>.
-#
-# Elasticsearch comes with reasonable defaults for most settings,
-# so you can try it out without bothering with configuration.
-#
-# Most of the time, these defaults are just fine for running a production
-# cluster. If you're fine-tuning your cluster, or wondering about the
-# effect of certain configuration option, please _do ask_ on the
-# mailing list or IRC channel [http://elasticsearch.org/community].
-
-# Any element in the configuration can be replaced with environment variables
-# by placing them in ${...} notation. For example:
-#
-#node.rack: ${RACK_ENV_VAR}
-
-# For information on supported formats and syntax for the config file, see
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup-configuration.html>
-
-
-################################### Cluster ###################################
-
-# Cluster name identifies your cluster for auto-discovery. If you're running
-# multiple clusters on the same network, make sure you're using unique names.
-#
-#cluster.name: elasticsearch
-{% if es_etc_cluster_name is defined %}cluster.name: {{ es_etc_cluster_name }}{% endif %}
-
-
-#################################### Node #####################################
-
-# Node names are generated dynamically on startup, so you're relieved
-# from configuring them manually. You can tie this node to a specific name:
-#
-#node.name: "Franz Kafka"
-{% if es_etc_node_name is defined %}node.name: {{ es_etc_node_name }}{% endif %}
-
-# Every node can be configured to allow or deny being eligible as the master,
-# and to allow or deny to store the data.
-#
-# Allow this node to be eligible as a master node (enabled by default):
-#
-#node.master: true
-#
-# Allow this node to store data (enabled by default):
-#
-#node.data: true
-{% if es_etc_node_master is defined %}node.master: {{ es_etc_node_master }}{% endif %}
-
-{% if es_etc_node_data is defined %}node.data: {{ es_etc_node_data }}{% endif %}
-
-# You can exploit these settings to design advanced cluster topologies.
-#
-# 1. You want this node to never become a master node, only to hold data.
-#    This will be the "workhorse" of your cluster.
-#
-#node.master: false
-#node.data: true
-#
-# 2. You want this node to only serve as a master: to not store any data and
-#    to have free resources. This will be the "coordinator" of your cluster.
-#
-#node.master: true
-#node.data: false
-#
-# 3. You want this node to be neither master nor data node, but
-#    to act as a "search load balancer" (fetching data from nodes,
-#    aggregating results, etc.)
-#
-#node.master: false
-#node.data: false
-
-# Use the Cluster Health API [http://localhost:9200/_cluster/health], the
-# Node Info API [http://localhost:9200/_nodes] or GUI tools
-# such as <http://www.elasticsearch.org/overview/marvel/>,
-# <http://github.com/karmi/elasticsearch-paramedic>,
-# <http://github.com/lukas-vlcek/bigdesk> and
-# <http://mobz.github.com/elasticsearch-head> to inspect the cluster state.
-
-# A node can have generic attributes associated with it, which can later be used
-# for customized shard allocation filtering, or allocation awareness. An attribute
-# is a simple key value pair, similar to node.key: value, here is an example:
-#
-#node.rack: rack314
-{% if es_etc_node_rack is defined %}node.rack: {{ es_etc_node_rack }}{% endif %}
-
-# By default, multiple nodes are allowed to start from the same installation location
-# to disable it, set the following:
-#node.max_local_storage_nodes: 1
-{% if es_etc_node_max_local_storage_nodes is defined %}node.max_local_storage_nodes: {{ es_etc_node_max_local_storage_nodes }}{% endif %}
-
-
-#################################### Index ####################################
-
-# You can set a number of options (such as shard/replica options, mapping
-# or analyzer definitions, translog settings, ...) for indices globally,
-# in this file.
-#
-# Note, that it makes more sense to configure index settings specifically for
-# a certain index, either when creating it or by using the index templates API.
-#
-# See <http://elasticsearch.org/guide/en/elasticsearch/reference/current/index-modules.html> and
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html>
-# for more information.
-
-# Set the number of shards (splits) of an index (5 by default):
-#
-#index.number_of_shards: 5
-{% if es_etc_index_number_of_shards is defined %}index.number_of_shards: {{ es_etc_index_number_of_shards }}{% endif %}
-
-# Set the number of replicas (additional copies) of an index (1 by default):
-#
-#index.number_of_replicas: 1
-{% if es_etc_index_number_of_replicas is defined %}index.number_of_replicas: {{ es_etc_index_number_of_replicas }}{% endif %}
-
-# Note, that for development on a local machine, with small indices, it usually
-# makes sense to "disable" the distributed features:
-#
-#index.number_of_shards: 1
-#index.number_of_replicas: 0
-
-# These settings directly affect the performance of index and search operations
-# in your cluster. Assuming you have enough machines to hold shards and
-# replicas, the rule of thumb is:
-#
-# 1. Having more *shards* enhances the _indexing_ performance and allows to
-#    _distribute_ a big index across machines.
-# 2. Having more *replicas* enhances the _search_ performance and improves the
-#    cluster _availability_.
-#
-# The "number_of_shards" is a one-time setting for an index.
-#
-# The "number_of_replicas" can be increased or decreased anytime,
-# by using the Index Update Settings API.
-#
-# Elasticsearch takes care about load balancing, relocating, gathering the
-# results from nodes, etc. Experiment with different settings to fine-tune
-# your setup.
-
-# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect
-# the index status.
-
-
-#################################### Paths ####################################
-
-# Path to directory containing configuration (this file and logging.yml):
-#
-#path.conf: /path/to/conf
-{% if es_etc_path_conf is defined %}path.conf: {{ es_etc_path_conf }}{% endif %}
-
-# Path to directory where to store index data allocated for this node.
-#
-#path.data: /path/to/data
-#
-# Can optionally include more than one location, causing data to be striped across
-# the locations (a la RAID 0) on a file level, favouring locations with most free
-# space on creation. For example:
-#
-#path.data: /path/to/data1,/path/to/data2
-{% if es_etc_path_data is defined %}path.data: {{ es_etc_path_data }}{% endif %}
-
-# Path to temporary files:
-#
-#path.work: /path/to/work
-{% if es_etc_path_work is defined %}path.work: {{ es_etc_path_work }}{% endif %}
-
-# Path to log files:
-#
-#path.logs: /path/to/logs
-{% if es_etc_path_logs is defined %}path.logs: {{ es_etc_path_logs }}{% endif %}
-
-# Path to where plugins are installed:
-#
-#path.plugins: /path/to/plugins
-{% if es_etc_path_plugins is defined %}path.plugins: {{ es_etc_path_plugins }}{% endif %}
-
-
-#################################### Plugin ###################################
-
-# If a plugin listed here is not installed for current node, the node will not start.
-#
-#plugin.mandatory: mapper-attachments,lang-groovy
-{% if es_etc_plugin_mandatory is defined %}plugin.mandatory: {{ es_etc_plugin_mandatory }}{% endif %}
-
-
-################################### Memory ####################################
-
-# Elasticsearch performs poorly when JVM starts swapping: you should ensure that
-# it _never_ swaps.
-#
-# Set this property to true to lock the memory:
-#
-#bootstrap.mlockall: true
-{% if es_etc_bootstrap_mlockall is defined %}bootstrap.mlockall: {{ es_etc_bootstrap_mlockall }}{% endif %}
-
-# Make sure that the ES_MIN_MEM and ES_MAX_MEM environment variables are set
-# to the same value, and that the machine has enough memory to allocate
-# for Elasticsearch, leaving enough memory for the operating system itself.
-#
-# You should also make sure that the Elasticsearch process is allowed to lock
-# the memory, eg. by using `ulimit -l unlimited`.
-
-
-############################## Network And HTTP ###############################
-
-# Elasticsearch, by default, binds itself to the 0.0.0.0 address, and listens
-# on port [9200-9300] for HTTP traffic and on port [9300-9400] for node-to-node
-# communication. (the range means that if the port is busy, it will automatically
-# try the next port).
-
-# Set the bind address specifically (IPv4 or IPv6):
-#
-#network.bind_host: 192.168.0.1
-{% if es_etc_network_bind_host is defined %}network.bind_host: {{ es_etc_network_bind_host }}{% endif %}
-
-# Set the address other nodes will use to communicate with this node. If not
-# set, it is automatically derived. It must point to an actual IP address.
-#
-#network.publish_host: 192.168.0.1
-{% if es_etc_network_publish_host is defined %}network.publish_host: {{ es_etc_network_publish_host }}{% endif %}
-
-# Set both 'bind_host' and 'publish_host':
-#
-#network.host: 192.168.0.1
-{% if es_etc_network_host is defined %}network.host: {{ es_etc_network_host }}{% endif %}
-
-# Set a custom port for the node to node communication (9300 by default):
-#
-#transport.tcp.port: 9300
-{% if es_etc_transport_tcp_port is defined %}transport.tcp.port: {{ es_etc_transport_tcp_port }}{% endif %}
-
-# Enable compression for all communication between nodes (disabled by default):
-#
-#transport.tcp.compress: true
-{% if es_etc_transport_tcp_compress is defined %}transport.tcp.compress: {{ es_etc_transport_tcp_compress }}{% endif %}
-
-# Set a custom port to listen for HTTP traffic:
-#
-#http.port: 9200
-{% if es_etc_http_port is defined %}http.port: {{ es_etc_http_port }}{% endif %}
-
-# Set a custom allowed content length:
-#
-#http.max_content_length: 100mb
-{% if es_etc_http_max_content_length is defined %}http.max_content_length: {{ es_etc_http_max_content_length }}{% endif %}
-
-# Disable HTTP completely:
-#
-#http.enabled: false
-{% if es_etc_http_enabled is defined %}http.enabled: {{ es_etc_http_enabled }}{% endif %}
-
-
-################################### Gateway ###################################
-
-# The gateway allows for persisting the cluster state between full cluster
-# restarts. Every change to the state (such as adding an index) will be stored
-# in the gateway, and when the cluster starts up for the first time,
-# it will read its state from the gateway.
-
-# There are several types of gateway implementations. For more information, see
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-gateway.html>.
-
-# The default gateway type is the "local" gateway (recommended):
-#
-#gateway.type: local
-{% if es_etc_gateway_type is defined %}gateway.type: {{ es_etc_gateway_type }}{% endif %}
-
-# Settings below control how and when to start the initial recovery process on
-# a full cluster restart (to reuse as much local data as possible when using shared
-# gateway).
-
-# Allow recovery process after N nodes in a cluster are up:
-#
-#gateway.recover_after_nodes: 1
-{% if es_etc_gateway_recover_after_nodes is defined %}gateway.recover_after_nodes: {{ es_etc_gateway_recover_after_nodes }}{% endif %}
-
-# Set the timeout to initiate the recovery process, once the N nodes
-# from previous setting are up (accepts time value):
-#
-#gateway.recover_after_time: 5m
-{% if es_etc_gateway_recover_after_time is defined %}gateway.recover_after_time: {{ es_etc_gateway_recover_after_time }}{% endif %}
-
-# Set how many nodes are expected in this cluster. Once these N nodes
-# are up (and recover_after_nodes is met), begin recovery process immediately
-# (without waiting for recover_after_time to expire):
-#
-#gateway.expected_nodes: 2
-{% if es_etc_gateway_expected_nodes is defined %}gateway.expected_nodes: {{ es_etc_gateway_expected_nodes }}{% endif %}
-
-
-############################# Recovery Throttling #############################
-
-# These settings allow to control the process of shards allocation between
-# nodes during initial recovery, replica allocation, rebalancing,
-# or when adding and removing nodes.
-
-# Set the number of concurrent recoveries happening on a node:
-#
-# 1. During the initial recovery
-#
-#cluster.routing.allocation.node_initial_primaries_recoveries: 4
-{% if es_etc_cluster_routing_allocation_node_initial_primaries_recoveries is defined %}cluster.routing.allocation.node_initial_primaries_recoveries: {{ es_etc_cluster_routing_allocation_node_initial_primaries_recoveries }}{% endif %}
-
-#
-# 2. During adding/removing nodes, rebalancing, etc
-#
-#cluster.routing.allocation.node_concurrent_recoveries: 2
-{% if es_etc_cluster_routing_allocation_node_concurrent_recoveries is defined %}cluster.routing.allocation.node_concurrent_recoveries: {{ es_etc_cluster_routing_allocation_node_concurrent_recoveries }}{% endif %}
-
-# Set to throttle throughput when recovering (eg. 100mb, by default 20mb):
-#
-#indices.recovery.max_bytes_per_sec: 20mb
-{% if es_etc_indices_recovery_max_bytes_per_sec is defined %}indices.recovery.max_bytes_per_sec: {{ es_etc_indices_recovery_max_bytes_per_sec }}{% endif %}
-
-# Set to limit the number of open concurrent streams when
-# recovering a shard from a peer:
-#
-#indices.recovery.concurrent_streams: 5
-{% if es_etc_indices_recovery_concurrent_streams is defined %}indices.recovery.concurrent_streams: {{ es_etc_indices_recovery_concurrent_streams }}{% endif %}
-
-
-################################## Discovery ##################################
-
-# Discovery infrastructure ensures nodes can be found within a cluster
-# and master node is elected. Multicast discovery is the default.
-
-# Set to ensure a node sees N other master eligible nodes to be considered
-# operational within the cluster. This should be set to a quorum/majority of
-# the master-eligible nodes in the cluster.
-#
-#discovery.zen.minimum_master_nodes: 1
-{% if es_etc_discovery_zen_minimum_master_nodes is defined %}discovery.zen.minimum_master_nodes: {{ es_etc_discovery_zen_minimum_master_nodes }}{% endif %}
-
-# Set the time to wait for ping responses from other nodes when discovering.
-# Set this option to a higher value on a slow or congested network
-# to minimize discovery failures:
-#
-#discovery.zen.ping.timeout: 3s
-{% if es_etc_discovery_zen_ping_timeout is defined %}discovery.zen.ping.timeout: {{ es_etc_discovery_zen_ping_timeout }}{% endif %}
-
-# For more information, see
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-zen.html>
-
-# Unicast discovery allows to explicitly control which nodes will be used
-# to discover the cluster. It can be used when multicast is not present,
-# or to restrict the cluster communication-wise.
-#
-# 1. Disable multicast discovery (enabled by default):
-#
-#discovery.zen.ping.multicast.enabled: false
-{% if es_etc_discovery_zen_ping_multicast_enabled is defined %}discovery.zen.ping.multicast.enabled: {{ es_etc_discovery_zen_ping_multicast_enabled }}{% endif %}
-
-#
-# 2. Configure an initial list of master nodes in the cluster
-#    to perform discovery when new nodes (master or data) are started:
-#
-#discovery.zen.ping.unicast.hosts: ["host1", "host2:port"]
-{% if es_etc_discovery_zen_ping_unicast_hosts is defined %}discovery.zen.ping.unicast.hosts: {{ es_etc_discovery_zen_ping_unicast_hosts }}{% endif %}
-
-# EC2 discovery allows to use AWS EC2 API in order to perform discovery.
-#
-# You have to install the cloud-aws plugin for enabling the EC2 discovery.
-#
-# For more information, see
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-ec2.html>
-#
-# See <http://elasticsearch.org/tutorials/elasticsearch-on-ec2/>
-# for a step-by-step tutorial.
-
-# GCE discovery allows to use Google Compute Engine API in order to perform discovery.
-#
-# You have to install the cloud-gce plugin for enabling the GCE discovery.
-#
-# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-gce>.
-
-# Azure discovery allows to use Azure API in order to perform discovery.
-#
-# You have to install the cloud-azure plugin for enabling the Azure discovery.
-#
-# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-azure>.
-
-################################## Slow Log ##################################
-
-# Shard level query and fetch threshold logging.
-
-#index.search.slowlog.threshold.query.warn: 10s
-#index.search.slowlog.threshold.query.info: 5s
-#index.search.slowlog.threshold.query.debug: 2s
-#index.search.slowlog.threshold.query.trace: 500ms
-{% if es_etc_index_search_slowlog_threshold_query_warn is defined %}index.search.slowlog.threshold.query.warn: {{ es_etc_index_search_slowlog_threshold_query_warn }}{% endif %}
-
-{% if es_etc_index_search_slowlog_threshold_query_info is defined %}index.search.slowlog.threshold.query.info: {{ es_etc_index_search_slowlog_threshold_query_info }}{% endif %}
-
-{% if es_etc_index_search_slowlog_threshold_query_debug is defined %}index.search.slowlog.threshold.query.debug: {{ es_etc_index_search_slowlog_threshold_query_debug }}{% endif %}
-
-{% if es_etc_index_search_slowlog_threshold_query_trace is defined %}index.search.slowlog.threshold.query.trace: {{ es_etc_index_search_slowlog_threshold_query_trace }}{% endif %}
-
-#index.search.slowlog.threshold.fetch.warn: 1s
-#index.search.slowlog.threshold.fetch.info: 800ms
-#index.search.slowlog.threshold.fetch.debug: 500ms
-#index.search.slowlog.threshold.fetch.trace: 200ms
-{% if es_etc_index_search_slowlog_threshold_fetch_warn is defined %}index.search.slowlog.threshold.fetch.warn: {{ es_etc_index_search_slowlog_threshold_fetch_warn }}{% endif %}
-
-{% if es_etc_index_search_slowlog_threshold_fetch_info is defined %}index.search.slowlog.threshold.fetch.info: {{ es_etc_index_search_slowlog_threshold_fetch_info }}{% endif %}
-
-{% if es_etc_index_search_slowlog_threshold_fetch_debug is defined %}index.search.slowlog.threshold.fetch.debug: {{ es_etc_index_search_slowlog_threshold_fetch_debug }}{% endif %}
-
-{% if es_etc_index_search_slowlog_threshold_fetch_trace is defined %}index.search.slowlog.threshold.fetch.trace: {{ es_etc_index_search_slowlog_threshold_fetch_trace }}{% endif %}
-
-#index.indexing.slowlog.threshold.index.warn: 10s
-#index.indexing.slowlog.threshold.index.info: 5s
-#index.indexing.slowlog.threshold.index.debug: 2s
-#index.indexing.slowlog.threshold.index.trace: 500ms
-{% if es_etc_index_indexing_slowlog_threshold_index_warn is defined %}index.indexing.slowlog.threshold.index.warn: {{ es_etc_index_indexing_slowlog_threshold_index_warn }}{% endif %}
-
-{% if es_etc_index_indexing_slowlog_threshold_index_info is defined %}index.indexing.slowlog.threshold.index.info: {{ es_etc_index_indexing_slowlog_threshold_index_info }}{% endif %}
-
-{% if es_etc_index_indexing_slowlog_threshold_index_debug is defined %}index.indexing.slowlog.threshold.index.debug: {{ es_etc_index_indexing_slowlog_threshold_index_debug }}{% endif %}
-
-{% if es_etc_index_indexing_slowlog_threshold_index_trace is defined %}index.indexing.slowlog.threshold.index.trace: {{ es_etc_index_indexing_slowlog_threshold_index_trace }}{% endif %}
-
-################################## GC Logging ################################
-
-#monitor.jvm.gc.young.warn: 1000ms
-#monitor.jvm.gc.young.info: 700ms
-#monitor.jvm.gc.young.debug: 400ms
-{% if es_etc_monitor_jvm_gc_young_warn is defined %}monitor.jvm.gc.young.warn: {{ es_etc_monitor_jvm_gc_young_warn }}{% endif %}
-
-{% if es_etc_monitor_jvm_gc_young_info is defined %}monitor.jvm.gc.young.info: {{ es_etc_monitor_jvm_gc_young_info }}{% endif %}
-
-{% if es_etc_monitor_jvm_gc_young_debug is defined %}monitor.jvm.gc.young.debug: {{ es_etc_monitor_jvm_gc_young_debug }}{% endif %}
-
-#monitor.jvm.gc.old.warn: 10s
-#monitor.jvm.gc.old.info: 5s
-#monitor.jvm.gc.old.debug: 2s
-{% if es_etc_monitor_jvm_gc_old_warn is defined %}monitor.jvm.gc.old.warn: {{ es_etc_monitor_jvm_gc_old_warn }}{% endif %}
-
-{% if es_etc_monitor_jvm_gc_old_info is defined %}monitor.jvm.gc.old.info: {{ es_etc_monitor_jvm_gc_old_info }}{% endif %}
-
-{% if es_etc_monitor_jvm_gc_old_debug is defined %}monitor.jvm.gc.old.debug: {{ es_etc_monitor_jvm_gc_old_debug }}{% endif %}
-
-################################## Security ################################
-
-# Uncomment if you want to enable JSONP as a valid return transport on the
-# http server. With this enabled, it may pose a security risk, so disabling
-# it unless you need it is recommended (it is disabled by default).
-#
-#http.jsonp.enable: true
-{% if es_etc_http_jsonp_enable is defined %}http.jsonp.enable: {{ es_etc_http_jsonp_enable }}{% endif %}
-
-############################## Additional Variables ############################
-script.inline: true
-script.indexed: true
-
-{% if es_etc is defined %}
-{% for key, value in es_etc.iteritems() %}
-{{ key }}: {{ value }}
-{% endfor %}
-{% endif %}
-
-threadpool.search.queue_size: 2000
-
-{% if es_group is defined %}
-cloud:
-  aws:
-    region: {{awsregion}}
-	{% if awskey is defined %}
-    access_key: {{awskey}}
-    {% endif %}
-	{% if awssecret is defined %}
-    secret_key: {{awssecret}}
-    {% endif %}
-    protocol: {{awsprotocol}}
-
-discovery:
-  type: ec2
-  ec2:
-    groups: {{es_group}}
-    host_type: private_ip
-    any_group: false
-    availability_zones: {{awsavailabilityzones}}
-{% endif %}
-
-cloud.azure.storage.my_account: {
-  account: {{ backup_storage_name }},
-  key: {{ backup_storage_key }}
-}
diff --git a/ansible/roles/elasticsearch_old/templates/logging.yml b/ansible/roles/elasticsearch_old/templates/logging.yml
deleted file mode 100644
index 660287c6b..000000000
--- a/ansible/roles/elasticsearch_old/templates/logging.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
-es.logger.level: {{ es_logging_level }}
-rootLogger: ${es.logger.level}, console, file
-logger:
-  # log action execution errors for easier debugging
-  action: INFO
-  # reduce the logging for aws, too much is logged under the default INFO
-  com.amazonaws: WARN
-
-  # gateway
-  #gateway: DEBUG
-  #index.gateway: DEBUG
-
-  # peer shard recovery
-  #indices.recovery: DEBUG
-
-  # discovery
-  discovery: INFO
-
-  index.search.slowlog: INFO, index_search_slow_log_file
-  index.indexing.slowlog: INFO, index_indexing_slow_log_file
-
-additivity:
-  index.search.slowlog: false
-  index.indexing.slowlog: false
-
-appender:
-  console:
-    type: console
-    layout:
-      type: consolePattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
-
-  file:
-    type: dailyRollingFile
-    file: ${path.logs}/${cluster.name}.log
-    datePattern: "'.'yyyy-MM-dd"
-    layout:
-      type: pattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
-
-  # Use the following log4j-extras RollingFileAppender to enable gzip compression of log files.
-  # For more information see https://logging.apache.org/log4j/extras/apidocs/org/apache/log4j/rolling/RollingFileAppender.html
-  #file:
-    #type: extrasRollingFile
-    #file: ${path.logs}/${cluster.name}.log
-    #rollingPolicy: timeBased
-    #rollingPolicy.FileNamePattern: ${path.logs}/${cluster.name}.log.%d{yyyy-MM-dd}.gz
-    #layout:
-      #type: pattern
-      #conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
-
-  index_search_slow_log_file:
-    type: dailyRollingFile
-    file: ${path.logs}/${cluster.name}_index_search_slowlog.log
-    datePattern: "'.'yyyy-MM-dd"
-    layout:
-      type: pattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
-
-  index_indexing_slow_log_file:
-    type: dailyRollingFile
-    file: ${path.logs}/${cluster.name}_index_indexing_slowlog.log
-    datePattern: "'.'yyyy-MM-dd"
-    layout:
-      type: pattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
diff --git a/ansible/roles/elasticsearch_old/vars/main.yml b/ansible/roles/elasticsearch_old/vars/main.yml
deleted file mode 100644
index ea80dc94c..000000000
--- a/ansible/roles/elasticsearch_old/vars/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-es_home: /usr/share/elasticsearch
-es_etc_node_name: "{{ node_name }}"
-es_etc_path_logs: /var/log/elasticsearch
-elasticsearch_config: /etc/elasticsearch
-
-
diff --git a/ansible/roles/esUpgrade/defaults/main.yml b/ansible/roles/esUpgrade/defaults/main.yml
deleted file mode 100755
index ded08a753..000000000
--- a/ansible/roles/esUpgrade/defaults/main.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-es_version: 5.4.3
-es_etc_discovery_zen_minimum_master_nodes: 1
-es_instance_name: log-es
-es_etc_cluster_name: log-es
-es_java_install: false
-es_api_host: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
-es_config: {
-    node.name: "{{ es_instance_name }}",
-    cluster.name: "{{ es_etc_cluster_name }}",
-    network.host: "{{ es_api_host }}",
-    discovery.zen.ping.unicast.hosts: "{{ groups['es'] }}",
-    node.data: "{{ es_etc_node_data }}",
-    node.master: "{{ es_etc_node_master }}",
-    discovery.zen.minimum_master_nodes: "{{ es_etc_discovery_zen_minimum_master_nodes }}",
-    bootstrap.memory_lock: true,
-    cloud.azure.storage.my_account: {
-      account: "{{ backup_storage_name }}",
-      key: "{{ backup_storage_key }}"
-    }
-}
-es_plugins:
-  - plugin: repository-azure
-es_plugins_reinstall: true
-
-# Override these values in group_vars
-sunbird_management_storage_account_name: backups
-sunbird_management_storage_account_key: '<backup_storage_key>'
diff --git a/ansible/roles/esUpgrade/meta/main.yml b/ansible/roles/esUpgrade/meta/main.yml
deleted file mode 100755
index f1420c7b3..000000000
--- a/ansible/roles/esUpgrade/meta/main.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-dependencies:
-- {
-    role: elasticsearch,
-    es_version: "5.4.3",
-    es_java_install: false,
-    es_plugins_reinstall: true,
-    es_api_host: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}",
-    es_config: {
-        node.name: "{{ es_instance_name }}",
-        cluster.name: "{{ es_etc_cluster_name }}",
-        network.host: "0.0.0.0",
-        discovery.zen.ping.unicast.hosts: "{{ groups['es'] }}",
-        node.data: "{{ es_etc_node_data }}",
-        node.master: "{{ es_etc_node_master }}",
-        discovery.zen.minimum_master_nodes: "{{ es_etc_discovery_zen_minimum_master_nodes   }}",
-        discovery.zen.minimum_master_nodes: "{{groups['es-upgrade']| length | int}}",
-        bootstrap.memory_lock: true,
-        cloud.azure.storage.my_account: {
-          account: "{{ sunbird_management_storage_account_name }}",
-          key: "{{ sunbird_management_storage_account_key }}"
-        }
-    },
-    es_plugins: [
-      {
-        plugin: "repository-azure"
-      }
-    ]
-  }
diff --git a/ansible/roles/esUpgrade/tasks/main.yml b/ansible/roles/esUpgrade/tasks/main.yml
deleted file mode 100644
index 53722e54e..000000000
--- a/ansible/roles/esUpgrade/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- debug: msg="ES version={{es_version}}"
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogEsUpgrade6xx/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml
similarity index 98%
rename from deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogEsUpgrade6xx/config.xml
rename to deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml
index 02a00d5d4..2979e2656 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogEsUpgrade6xx/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml
@@ -109,7 +109,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/provision/log-es-upgrade/Jenkinsfile.latest</scriptPath>
+    <scriptPath>pipelines/provision/log-es-upgrade/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/pipelines/provision/log-es-upgrade/Jenkinsfile b/pipelines/provision/log-es-upgrade/Jenkinsfile
index 8a7743d6a..c5cba075d 100644
--- a/pipelines/provision/log-es-upgrade/Jenkinsfile
+++ b/pipelines/provision/log-es-upgrade/Jenkinsfile
@@ -24,7 +24,7 @@ node() {
                 module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim()
                 jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
                 currentWs = sh(returnStdout: true, script: 'pwd').trim()
-                ansiblePlaybook = "${currentWs}/ansible/esupgrade.yml"
+                ansiblePlaybook = "${currentWs}/ansible/provision-log-es.yml"
                 ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass"
                 values.put('currentWs', currentWs)
                 values.put('env', envDir)
diff --git a/pipelines/provision/log-es-upgrade/Jenkinsfile.latest b/pipelines/provision/log-es-upgrade/Jenkinsfile.latest
deleted file mode 100644
index 38d0bf410..000000000
--- a/pipelines/provision/log-es-upgrade/Jenkinsfile.latest
+++ /dev/null
@@ -1,51 +0,0 @@
-@Library('deploy-conf') _
-node() {
-    try {
-        String ANSI_GREEN = "\u001B[32m"
-        String ANSI_NORMAL = "\u001B[0m"
-        String ANSI_BOLD = "\u001B[1m"
-        String ANSI_RED = "\u001B[31m"
-        String ANSI_YELLOW = "\u001B[33m"
-
-        stage('checkout public repo') {
-            folder = new File("$WORKSPACE/.git")
-            if (folder.exists())
-            {
-               println "Found .git folder. Clearing it.."
-               sh'git clean -fxd'
-            }
-            checkout scm
-        }
-
-        ansiColor('xterm') {
-            stage('deploy'){
-                values = [:]
-                envDir = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-3].trim()
-                module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim()
-                jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
-                currentWs = sh(returnStdout: true, script: 'pwd').trim()
-                ansiblePlaybook = "${currentWs}/ansible/esupgradelatest.yml"
-                ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass"
-                values.put('currentWs', currentWs)
-                values.put('env', envDir)
-                values.put('module', module)
-                values.put('jobName', jobName)
-                values.put('ansiblePlaybook', ansiblePlaybook)
-                values.put('ansibleExtraArgs', ansibleExtraArgs)
-                println values
-                ansible_playbook_run(values)
-                currentBuild.result = 'SUCCESS'
-                currentBuild.description = "Private: ${params.private_branch}, Public: ${params.branch_or_tag}"
-            }
-        }
-         summary()
-     }
-    catch (err) {
-        currentBuild.result = 'FAILURE'
-        throw err
-    }    
-    finally {
-        slack_notify(currentBuild.result)
-        email_notify()
-    }
-}

From 8bb10f6cd21f628e16fbdde5dd26d9d8d6121c5b Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Fri, 29 Jan 2021 09:49:04 +0530
Subject: [PATCH 152/184] Adding nodebb init vars and deleting explicit config
 (#2191)

Nodebb can be init with env vars
ref: https://community.nodebb.org/topic/4325/set-up-nodebb-via-environment-variables

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../templates/sunbird_nodebb.env              | 11 +++++++++++
 .../core/nodebb/templates/configmap.yaml      | 19 -------------------
 .../core/nodebb/templates/deployment.yaml     |  8 --------
 3 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 kubernetes/helm_charts/core/nodebb/templates/configmap.yaml

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env b/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
index e69de29bb..b58add336 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
@@ -0,0 +1,11 @@
+# Initialization variable for mongo
+# Ref: https://community.nodebb.org/topic/4325/set-up-nodebb-via-environment-variables
+database=mongo
+secret={{nodebb_hash_key|default('1d57ba64-86d4-43ff-bd10-f6e9e0782899')}}
+url=http://0.0.0.0:4567/discussions/
+mongo__host={{mongo_nodebb_host}}
+mongo__database=nodebb
+# password won't get overwritten if you run
+# 'node app --setup' multiple times
+# Default username is admin
+admin__password={{ nodebb_admin_password }}
diff --git a/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml b/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
deleted file mode 100644
index 12aed75c1..000000000
--- a/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file will get replaced at runtime
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: nodebb-config-json
-data:
-  config.json: |-
-     {
-         "url": "{{ .Values.nodebb_url }}",
-         "secret": "100101",
-         "database": "mongo",
-         "port": "4567",
-         "mongo": {
-             "host": "{{ .Values.mongo_nodebb_host }}",
-             "port": "27017",
-             "database": "nodebb"
-         }
-     }
\ No newline at end of file
diff --git a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
index 3b70382da..11be85131 100644
--- a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
@@ -24,10 +24,6 @@ spec:
       imagePullSecrets:
       - name: {{ .Values.imagepullsecrets }}
 {{- end }}
-      volumes:
-      - name: nodebb-config-json
-        configMap:
-           name: nodebb-config-json
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
@@ -35,10 +31,6 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ .Chart.Name }}-config
-        volumeMounts:
-          - name: nodebb-config-json
-            mountPath: /usr/src/app/config.json
-            subPath: config.json
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         ports:

From edd9537705980d81cfade2ddc46eea47b17259c7 Mon Sep 17 00:00:00 2001
From: VenkatKadiveti <60449077+VenkatKadiveti@users.noreply.github.com>
Date: Fri, 29 Jan 2021 10:44:43 +0530
Subject: [PATCH 153/184] Issues #SB-21326 fix: adding commit hash for nodebb
 plugins (#2192)

---
 pipelines/build/nodebb/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pipelines/build/nodebb/Dockerfile b/pipelines/build/nodebb/Dockerfile
index e9c730d08..188d2c866 100644
--- a/pipelines/build/nodebb/Dockerfile
+++ b/pipelines/build/nodebb/Dockerfile
@@ -11,11 +11,11 @@ RUN npm install --only=prod && \
     npm cache clean --force
 
 
-RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-oidc.git
-RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-api.git
-RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-telemetry.git
-RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-azure-storage.git
-RUN npm install https://github.com/NodeBB/nodebb-plugin-write-api.git
+RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-oidc.git#7482a20a2c2670d4409ef936df35fd260293bcce
+RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-api.git#105d83c0accf095115eced997aa7a756d9923a62
+RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-sunbird-telemetry.git#f6ae10182c881b6d05b1d29208ac2d328d920f11
+RUN npm install https://github.com/Sunbird-Ed/nodebb-plugin-azure-storage.git#3469f7a2169ab08bdc1c7b9b756b1405d387e9c6
+RUN npm install https://github.com/NodeBB/nodebb-plugin-write-api.git#cc795803a1c61042fc6eebeaabc89e4d8c233362
 
 
 

From 7311fe95dc36c19af5aad39a575df59618bbb349 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Fri, 29 Jan 2021 12:33:44 +0530
Subject: [PATCH 154/184] Adding discussions mw build job (#2195)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../jobs/DiscussionsMiddleware/config.xml     | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml

diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
new file mode 100644
index 000000000..3c75acdec
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
@@ -0,0 +1,85 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/Sunbird-Ed/discussions-middleware</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>

From 971ac0a80a4bbc8a0ab4136835a799ff59be733f Mon Sep 17 00:00:00 2001
From: keshavprasadms <msknext@gmail.com>
Date: Fri, 29 Jan 2021 12:54:56 +0530
Subject: [PATCH 155/184] fix: updating vars to point to svc

---
 ansible/inventory/env/group_vars/all.yml               | 10 +++++-----
 .../stack-sunbird/templates/sunbird_lms-service.env    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index d1cfae124..71d4f4535 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -110,8 +110,8 @@ sunbird_cassandra_host: "{{groups['cassandra']|join(',')}}"  #Private IP of Cass
 sunbird_es_host: "{{groups['es']| join(',')}}"
 
 ## Application server configurations
-sunbird_analytics_api_base_url: "analytics-service.{{namespace}}.svc.cluster.local:9000"
-sunbird_search_service_api_base_url: "http://{{private_ingressgateway_ip}}/search"
+sunbird_analytics_api_base_url: "http://analytics-service.{{namespace}}.svc.cluster.local:9000"
+sunbird_search_service_api_base_url: "http://search-service.{{namespace}}.svc.cluster.local:9000"
 sunbird_mail_server_host: "{{ mail_server_host }}"  #SMTP server IP. Could be ignored if not mails are to be sent.
 sunbird_mail_server_port: "{{ mail_server_port }}" #SMTP port. Could be ignored if not mails are to be sent.
 sunbird_mail_server_username: "{{ mail_server_username }}"  #SMTP username. Could be ignored if not mails are to be sent.
@@ -197,8 +197,8 @@ sunbird_dial_repo_api_key: "{{ core_vault_sunbird_ekstep_api_key }}"
 sunbird_plugin_repo_api_base_url: "{{ sunbird_search_service_api_base_url }}"
 sunbird_data_service_api_base_url: "{{sunbird_ekstep_api_base_url}}"
 sunbird_data_service_api_key: "{{ core_vault_sunbird_ekstep_api_key }}"
-sunbird_content_service_api_base_url: "http://{{private_ingressgateway_ip}}/content"
-sunbird_user_service_api_base_url: "http://{{private_ingressgateway_ip}}/learner"
+sunbird_content_service_api_base_url: "http:///content-service.{{namespace}}.svc.cluster.local:9000"
+sunbird_user_service_api_base_url: "http:///learner-service.{{namespace}}.svc.cluster.local:9000"
 sunbird_group_service_api_base_url: "http://groups-service:9000"
 
 #API Manager
@@ -650,7 +650,7 @@ group_activity_agg_cache_enable: false
 # nodebb variables
 sunbird_nodebb_storage_key: "{{ core_vault_sunbird_nodebb_storage_key }}"
 mongo_nodebb_host: "{{ groups['mongo'] | join(':27017,')}}:27017"
-kibana_service: kibana.logging.svc.cluster.local:5601
+kibana_service: "http://kibana.logging.svc.cluster.local:5601"
 sunbird_dial_repo_api_base_url: "http://{{dialservice_ip}}:9001"
 
 #report service
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
index 700b8be36..f03b395f3 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
@@ -100,7 +100,7 @@ sunbird_cache_enable={{sunbird_cache_enable | default(false)}}
 # Set below variables if above true
 sunbird_redis_host={{sunbird_redis_host}}
 sunbird_redis_port={{sunbird_redis_port|default(6379)}}
-sunbird_user_org_api_base_url={{ lms_learner_api_base_url | default('http://learner-service:9000') }}
+sunbird_user_org_api_base_url={{ sunbird_user_service_api_base_url }}
 
 kafka_topics_instruction={{kafka_topics_instruction}}
 kafka_urls={{kafka_urls}}
@@ -112,7 +112,7 @@ sunbird_cert_service_base_url=http://cert-service:9000
 
 learning_service_base_url={{sunbird_content_repo_api_base_url}}
 sunbird_user_search_cretordetails_fields=id,firstName,lastName
-sunbird_user_service_api_base_url={{ lms_learner_api_base_url | default('http://learner-service:9000') }}
+sunbird_user_service_api_base_url={{ sunbird_user_service_api_base_url }}
 
 limit_managed_user_creation={{limit_managed_user_creation | default(true)}}
 managed_user_limit={{managed_user_limit | default(30)}}

From 748aef427141d148eb9815543ebf5554dc9e9dc4 Mon Sep 17 00:00:00 2001
From: G33tha <geethap240@gmail.com>
Date: Tue, 2 Feb 2021 18:11:00 +0530
Subject: [PATCH 156/184] updated chatbot config upload jenkins file (#2201)

* updated chantbot config upload jenkins file

* Update Jenkinsfile
---
 pipelines/upload/chatbot/Jenkinsfile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pipelines/upload/chatbot/Jenkinsfile b/pipelines/upload/chatbot/Jenkinsfile
index 0ecbbcd98..6aaf6d0c3 100644
--- a/pipelines/upload/chatbot/Jenkinsfile
+++ b/pipelines/upload/chatbot/Jenkinsfile
@@ -18,8 +18,16 @@ node() {
         }
 
         stage('clone chatbot config repo') {
-            sh("rm -rf sunbird-bot")
-            sh("git clone https://github.com/project-sunbird/sunbird-bot.git -b ${params.bot_repo_branch}")
+            if (params.bot_repo == "https://github.com/project-sunbird/sunbird-bot.git") {
+                sh("rm -rf sunbird-bot")
+                sh("git clone ${params.bot_repo} -b ${params.bot_repo_branch}")
+            }
+            else {
+                sh("rm -rf private-bot-repo")
+                dir('private-bot-repo') {
+                    checkout([$class: 'GitSCM', branches: [[name: "refs/remotes/origin/$params.bot_repo_branch"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: true]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'private_repo_credentials', url: "$params.bot_repo"]]])
+                }
+            }    
         }
 
         ansiColor('xterm') {
@@ -47,3 +55,4 @@ node() {
         throw err
     }
 }
+

From 8ffab942b5e7cca8c29286e63194ac7bbdf5ad10 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Wed, 3 Feb 2021 16:24:09 +0530
Subject: [PATCH 157/184] feat: TG-831 nginx cache configurability (#2203)

* fix: nginx cache configurable ttl

* fix: simplified caching names and ttls

* fix: remove all trailing whitespaces
---
 .../roles/helm-deploy/defaults/main.yml       |  26 ++++
 .../core/nginx-public-ingress/values.j2       | 136 +++++++++---------
 2 files changed, 91 insertions(+), 71 deletions(-)

diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index 19c703d0d..a1b88f665 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -36,6 +36,32 @@ kibana_service: "{{swarm_dashboard}}:5601"
 upstream_url: "ekstep-public-{{ekstep_s3_env}}.s3-ap-south-1.amazonaws.com"
 plugin_upstream_url: "ekstep-public-{{ekstep_s3_env}}.s3-ap-south-1.amazonaws.com"
 sunbird_offline_azure_storage_account_url: "{{ sunbird_public_storage_account_name }}.blob.core.windows.net/{{ offline_installer_container_name }}"
+
+proxy_cache_path:
+  large_cache:
+    path: /tmp/large_cache
+    levels: "1:2"
+    keys_zone: large_cache:3m
+    max_size: 100m
+    inactive: 10m
+  medium_cache:
+    path: /tmp/medium_cache
+    levels: "1:2"
+    keys_zone: medium_cache:2m
+    max_size: 50m
+    inactive: 10m
+  small_cache:
+    path: /tmp/small_cache
+    levels: "1:2"
+    keys_zone: small_cache:1m
+    max_size: 10m
+    inactive: 10m
+
+proxy_cache_valid:
+  long_validity: 5m
+  medium_validity: 4m
+  short_validity: 3m
+
 adminutils_liveness_readiness:
   healthcheck: true
   readinessProbe:
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 10ae2a8aa..45426bc2a 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -163,14 +163,14 @@ proxyconfig: |-
     location ~ /auth/(resources/(.+\.(png|svg|ico|js|eot|ttf|woff|woff2|css))|welcome-content/(.+\.(png|svg|ico|js|eot|ttf|woff|woff2|css))) {
       # Enabling caching
       proxy_cache_key $proxy_host$request_uri;
-      proxy_cache proxy_cache;
+      proxy_cache {{proxy_cache_path.small_cache.keys_zone.split(':') | first}};
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
       proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 43200;
+      proxy_cache_valid 200 {{proxy_cache_valid.long_validity}};
       rewrite ^/auth/(.*) /auth/$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
@@ -190,7 +190,7 @@ proxyconfig: |-
       # Enabling caching
       # caching include Accept-Encoding header also, to provide gziped or plain content as per request
       proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
-      proxy_cache framework_cache;
+      proxy_cache {{proxy_cache_path.medium_cache.keys_zone.split(':') | first}};
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
       proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
@@ -198,7 +198,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 43200;
+      proxy_cache_valid 200 {{proxy_cache_valid.long_validity}};
       proxy_set_header Connection "";
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
@@ -218,7 +218,7 @@ proxyconfig: |-
       # Enabling caching
       # caching include Accept-Encoding header also, to provide gziped or plain content as per request
       proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
-      proxy_cache content_cache;
+      proxy_cache {{proxy_cache_path.large_cache.keys_zone.split(':') | first}};
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
       proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
@@ -226,7 +226,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 14400s;
+      proxy_cache_valid 200 {{proxy_cache_valid.medium_validity}};
       # Increasing the proxy buffer size
       proxy_buffer_size 16k;
       proxy_busy_buffers_size 16k;
@@ -248,7 +248,7 @@ proxyconfig: |-
       # Enabling caching
       # caching include Accept-Encoding header also, to provide gziped or plain content as per request
       proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
-      proxy_cache content_cache;
+      proxy_cache {{proxy_cache_path.large_cache.keys_zone.split(':') | first}};
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
       proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
@@ -256,7 +256,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 14400s;
+      proxy_cache_valid 200 {{proxy_cache_valid.medium_validity}};
       # Increasing the proxy buffer size
       proxy_buffer_size 16k;
       proxy_busy_buffers_size 16k;
@@ -278,7 +278,7 @@ proxyconfig: |-
       # Enabling caching
       # caching include Accept-Encoding header also, to provide gziped or plain content as per request
       proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
-      proxy_cache framework_cache;
+      proxy_cache {{proxy_cache_path.medium_cache.keys_zone.split(':') | first}};
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
       proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
@@ -286,7 +286,7 @@ proxyconfig: |-
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 43200;
+      proxy_cache_valid 200 {{proxy_cache_valid.long_validity}};
       rewrite ^/api/(.*) /$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
@@ -306,14 +306,14 @@ proxyconfig: |-
       # Enabling caching
       # caching include Accept-Encoding header also, to provide gziped or plain content as per request
       proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
-      proxy_cache framework_cache;
+      proxy_cache {{proxy_cache_path.medium_cache.keys_zone.split(':') | first}};
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
       proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 43200;
+      proxy_cache_valid 200 {{proxy_cache_valid.long_validity}};
       rewrite ^/api/(.*) /$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
@@ -748,22 +748,22 @@ proxyconfig: |-
          proxy_set_header X-Request-ID $sb_request_id;
          proxy_pass             https://$offline_bucket/$url_full;
   }
-    # compression for svg certs download                      
-    location /api/certreg/v2/certs/download {                 
-      rewrite ^/api/(.*) /$1 break;                           
+    # compression for svg certs download
+    location /api/certreg/v2/certs/download {
+      rewrite ^/api/(.*) /$1 break;
       include /etc/nginx/defaults.d/compression.conf;
-      proxy_set_header Connection "";                         
-      proxy_set_header Host $host;                            
-      proxy_set_header X-Real-IP $remote_addr;                
-      proxy_set_header X-Scheme $scheme;                      
-      proxy_set_header    X-Forwarded-For   $remote_addr;     
-      proxy_connect_timeout 5;                                
-      proxy_send_timeout 60;                                  
-      proxy_read_timeout 70;                                  
-      proxy_http_version 1.1;                                 
-      proxy_set_header X-Request-ID $sb_request_id;           
-      proxy_pass http://kong;                                 
-    }                                                         
+      proxy_set_header Connection "";
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Scheme $scheme;
+      proxy_set_header    X-Forwarded-For   $remote_addr;
+      proxy_connect_timeout 5;
+      proxy_send_timeout 60;
+      proxy_read_timeout 70;
+      proxy_http_version 1.1;
+      proxy_set_header X-Request-ID $sb_request_id;
+      proxy_pass http://kong;
+    }
     location /learner/certreg/v2/certs/download {
       # Compression
       gzip on;
@@ -851,14 +851,14 @@ proxyconfig: |-
       # Enabling caching
       # caching include Accept-Encoding header also, to provide gziped or plain content as per request
       proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
-      proxy_cache framework_cache;
+      proxy_cache {{proxy_cache_path.medium_cache.keys_zone.split(':') | first}};
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
       proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 43200;
+      proxy_cache_valid 200 {{proxy_cache_valid.long_validity}};
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
       proxy_set_header X-Scheme $scheme;
@@ -873,14 +873,14 @@ proxyconfig: |-
       # Enabling caching
       # caching include Accept-Encoding header also, to provide gziped or plain content as per request
       proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
-      proxy_cache framework_cache;
+      proxy_cache {{proxy_cache_path.medium_cache.keys_zone.split(':') | first}};
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
       proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 43200;
+      proxy_cache_valid 200 {{proxy_cache_valid.long_validity}};
       rewrite ^/api/channel/v1/read/(.*) /channel/v1/read/$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
@@ -914,7 +914,7 @@ proxyconfig: |-
     }
     {# Including custom configuration #}
     {{ proxy_custom_config }}}
-  
+
 nginxconfig: |
   user  nginx;
   worker_processes  {{nginx_worker_processes | d("auto")}};
@@ -1020,7 +1020,7 @@ nginxconfig: |
       #################
       # Caching Block #
       #################
-      # 
+      #
       # Keywords
       #
       # proxy_cache_path: path to store the cache content
@@ -1031,16 +1031,10 @@ nginxconfig: |
       # use_temp_path: do we have to write the cache to a temp path first? This will reduce the performance.
       #
       # caching for images and files
-      proxy_cache_path /tmp/proxy_cache levels=1:2 keys_zone=tmp_cache:5m max_size=10m inactive=300m use_temp_path=off;
-      # caching for apis
-      proxy_cache_path /tmp/api_cache levels=1:2 keys_zone=proxy_cache:5m max_size=600m inactive=1400m use_temp_path=off;
-      # cache framework
-      proxy_cache_path /tmp/framework_cache levels=1:2 keys_zone=framework_cache:5m max_size=700m inactive=300m use_temp_path=off;
-      # cache content
-      proxy_cache_path /tmp/content_cache levels=1:2 keys_zone=content_cache:100m max_size=3000m inactive=600m use_temp_path=off;
-      # cache content metadata
-      proxy_cache_path /tmp/content_metadata levels=1:2 keys_zone=content_metadata:100m max_size=1000m inactive=300m use_temp_path=off;
-      
+      {% for key,value in proxy_cache_path.items() %}
+      proxy_cache_path {{value['path']}} levels={{value['levels']}} keys_zone={{value['keys_zone']}} max_size={{value['max_size']}} inactive={{value['inactive']}} use_temp_path=off;
+      {% endfor %}
+
      server {
        listen 9145;
        location /metrics {
@@ -1126,14 +1120,14 @@ keycloakconf: |
       # Enabling caching
       # caching include Accept-Encoding header also, to provide gziped or plain content as per request
       proxy_cache_key "$http_accept_encoding|$request_uri|$request_body";
-      proxy_cache proxy_cache;
+      proxy_cache {{proxy_cache_path.small_cache.keys_zone.split(':') | first}};
       add_header X-Proxy-Cache $upstream_cache_status;
       add_header X-Proxy-Cache-Date $upstream_http_date;
       proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
       proxy_cache_revalidate on;
       proxy_cache_background_update on;
       proxy_cache_lock on;
-      proxy_cache_valid 200 14400;
+      proxy_cache_valid 200 {{proxy_cache_valid.long_validity}};
       rewrite ^/auth/(.*) /auth/$1 break;
       proxy_set_header Connection "";
       proxy_set_header Host $host;
@@ -1163,33 +1157,33 @@ keycloakconf: |
   }
 
 compressionConfig: |-
-  # Compression                                           
-  gzip on;                                                
-  gzip_comp_level    5;                                   
+  # Compression
+  gzip on;
+  gzip_comp_level    5;
   gzip_min_length    256; # 256Bytes
-  gzip_proxied       any;                                 
-  gzip_vary          on;                                  
-  # Content types for compression                         
-  gzip_types                                              
-  application/atom+xml                                    
-  application/javascript                                  
-  application/json                                        
-  application/ld+json                                     
-  application/manifest+json                               
-  application/rss+xml                                     
-  application/vnd.geo+json                                
-  application/vnd.ms-fontobject                           
-  application/x-font-ttf                                  
-  application/x-web-app-manifest+json                     
-  application/xhtml+xml                                   
-  application/xml                                         
-  font/opentype                                           
-  image/bmp                                               
-  image/svg+xml                                           
-  image/x-icon                                            
-  text/cache-manifest                                     
-  text/css                                                
-  text/plain                                              
+  gzip_proxied       any;
+  gzip_vary          on;
+  # Content types for compression
+  gzip_types
+  application/atom+xml
+  application/javascript
+  application/json
+  application/ld+json
+  application/manifest+json
+  application/rss+xml
+  application/vnd.geo+json
+  application/vnd.ms-fontobject
+  application/x-font-ttf
+  application/x-web-app-manifest+json
+  application/xhtml+xml
+  application/xml
+  font/opentype
+  image/bmp
+  image/svg+xml
+  image/x-icon
+  text/cache-manifest
+  text/css
+  text/plain
   ;
 
 serviceMonitor:

From bee4f25f578f23b98937e2a04ddf158e8951b2ee Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Wed, 3 Feb 2021 11:13:26 +0000
Subject: [PATCH 158/184] Adding nginx private endpoint (#2205)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../nginx-private-ingress/templates/configmap.yaml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml b/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
index a79679825..759e81edc 100644
--- a/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
+++ b/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
@@ -22,7 +22,7 @@ data:
                         ' "$http_referer" "$http_user_agent" "$sb_request_id"'
                         ' "$http_x_device_id" "$http_x_channel_id" "$http_x_app_id"'
                         ' "$http_x_app_ver" "$http_x_session_id"';
-    
+
       # If the client send request_id it should be preffered over the default one
       map $http_x_request_id $sb_request_id {
         default  $http_x_request_id;
@@ -33,13 +33,13 @@ data:
       include /etc/nginx/conf.d/*.conf;
       sendfile        on;
       client_max_body_size 60M;
-        
+
       server {
         listen 80;
         listen [::]:80;
-    
+
         resolver {{ .Values.kube_dns_ip }};
-    
+
         location /learner/ {
           set $target http://learner-service.{{ .Values.namespace }}.svc.cluster.local:9000;
           rewrite ^/learner/(.*) /$1 break;
@@ -136,6 +136,12 @@ data:
           rewrite ^/enc/(.*) /$1 break;
           proxy_pass $target;
         }
+        location /prometheus/ {
+          # This endpoint is for prometheus endpoint access
+          set $target http://sunbird-monitoring-prometheus.monitoring.svc.cluster.local:9090;
+          rewrite ^/prometheus/(.*) /$1 break;
+          proxy_pass $target;
+        }
         location /nodebb/ {
           set $target http://nodebb-service.{{ .Values.namespace }}.svc.cluster.local:4567;
           rewrite ^/enc/(.*) /$1 break;

From 6b312236fcbeecc515a3605df94fc5c15ea5fff6 Mon Sep 17 00:00:00 2001
From: Amit Priyadarshi <darshi.1983@gmail.com>
Date: Thu, 4 Feb 2021 17:05:47 +0530
Subject: [PATCH 159/184] Issue #SC-2203 feat: Remove primary category from
 channel content and collection primaryCategory (#2210)

---
 .../stack-sunbird/templates/content-service_application.conf  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index 8329a4031..86ea4f2a9 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -565,11 +565,11 @@ objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_s
 #Default objectCategory mapping for channel
 channel {
   content{
-    primarycategories=["Course Assessment", "eTextbook", "Explanation Content", "Learning Resource", "Practice Question Set", "Teacher Resource", "Exam Question"]
+    primarycategories=["Course Assessment", "eTextbook", "Explanation Content", "Learning Resource", "Practice Question Set", "Teacher Resource"]
     additionalcategories=["Classroom Teaching Video", "Concept Map", "Curiosity Question Set", "Experiential Resource", "Explanation Video", "Focus Spot", "Learning Outcome Definition", "Lesson Plan", "Marking Scheme Rubric", "Pedagogy Flow", "Previous Board Exam Papers", "TV Lesson", "Textbook"]
   }
   collection {
-    primarycategories=["Content Playlist", "Course", "Digital Textbook", "Question paper"]
+    primarycategories=["Content Playlist", "Course", "Digital Textbook"]
     additionalcategories=["Textbook", "Lesson Plan"]
   }
   asset {

From b03455d705a760c139d8d54df81bd0ed7ef80e7c Mon Sep 17 00:00:00 2001
From: sknirmalkar89 <59080585+sknirmalkar89@users.noreply.github.com>
Date: Thu, 4 Feb 2021 19:01:58 +0530
Subject: [PATCH 160/184] SB-22950:Update portal env config (#2209)

* SB-22950:Update portal env config

* SB-22950: change player service env var
---
 .../stack-sunbird/templates/sunbird_learner-service.env     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
index 2b3c5b1a1..dfb65e715 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
@@ -112,8 +112,6 @@ sunbird_otp_allowed_attempt={{sunbird_otp_allowed_attempt|default(2)}}
 SUNBIRD_KAFKA_URL={{kafka_urls}}
 ENV_NAME={{env_name}}
 notification_service_base_url=http://notification-service:9000
-form_api_endpoint={{form_api_endpoint | default('/api/data/v1/form/read')}}
-form_api_base_url={{sunbird_portal_base_url}}
 # Release-3.4.0
 feed_limit={{feed_limit | default(30)}}
 
@@ -123,3 +121,7 @@ accesstoken.publickey.basepath={{learner_device_basepath | default('/keys/')}}
 ## Captcha keys ##
 google_captcha_private_key={{google_captcha_private_key  | default("")}}
 google_captcha_mobile_private_key={{google_captcha_mobile_private_key | default("")}}
+PORTAL_SERVICE_PORT=http://player.{{namespace}}.svc.cluster.local:3000
+form_api_endpoint={{form_api_endpoint | default('/plugin/v1/form/read')}}
+
+

From 4f4c9e1c5d12419ba3fa6ed7ea6f3462984cd1b0 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Thu, 11 Feb 2021 05:11:57 +0000
Subject: [PATCH 161/184] Fluentbit change image version to 1.6.10 and (#2218)

Increased storage backlog size limit to 20G

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../helm_charts/logging/fluent-bit/templates/configMap.yaml | 6 +++---
 kubernetes/helm_charts/logging/fluent-bit/values.yaml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml b/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
index 8c3579e20..ab7cf9110 100644
--- a/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
+++ b/kubernetes/helm_charts/logging/fluent-bit/templates/configMap.yaml
@@ -12,7 +12,7 @@ data:
         # Merge application log to kubernetes structure
         Merge_Log           On
         # Disabling merge key as all the fileds will be in the root
-        # Else all merged content will be under 
+        # Else all merged content will be under
         # log_processed:
         #    {
         #    }
@@ -22,7 +22,7 @@ data:
         Merge_Parser        catchall
         # Don't need merged logs
         # More over, we're using custom parser, which catch all and tag it as log
-        Keep_Log            Off 
+        Keep_Log            Off
         # Annotate pod to select the parser
         # annotaions:
         #   fluentbit.io/parsers: nginx2
@@ -98,7 +98,7 @@ data:
         # After this LRU will kick in; that means LeastRecentlyUsed will get deleted
         # 1 chunk =~ 2MB
         # This config has some issues; see https://github.com/fluent/fluent-bit/issues/2688
-        # storage.total_limit_size 20G
+        storage.total_limit_size 20G
   parsers.conf: |
     [PARSER]
         Name   apache
diff --git a/kubernetes/helm_charts/logging/fluent-bit/values.yaml b/kubernetes/helm_charts/logging/fluent-bit/values.yaml
index cf2ed26c7..63c3222f0 100644
--- a/kubernetes/helm_charts/logging/fluent-bit/values.yaml
+++ b/kubernetes/helm_charts/logging/fluent-bit/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: fluent/fluent-bit
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "1.6.3"
+  tag: "1.6.10"
 
 es_host: log-es.logging.svc.cluster.local
 es_port: 9200

From 4412dda8fe57f55cefa9c736d57fcbcd325c8446 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <keshavprasadms@gmail.com>
Date: Thu, 11 Feb 2021 17:25:36 +0530
Subject: [PATCH 162/184] fix: updating JFs as per new jenkins jobs parameter
 (#2220)

---
 .../Jenkinsfile                               | 19 ++++--------
 images/kafka-topic-exporter/Jenkinsfile       | 18 ++++--------
 images/kong/Jenkinsfile.build                 | 23 ++++-----------
 images/openbadger/Jenkinsfile                 | 29 ++++---------------
 images/proxy/Jenkinsfile                      | 19 ++++--------
 pipelines/build/nodebb/Jenkinsfile            | 22 +++++---------
 6 files changed, 33 insertions(+), 97 deletions(-)

diff --git a/images/azure-ambari-prometheus-exporter/Jenkinsfile b/images/azure-ambari-prometheus-exporter/Jenkinsfile
index f25310a25..5339bcf50 100644
--- a/images/azure-ambari-prometheus-exporter/Jenkinsfile
+++ b/images/azure-ambari-prometheus-exporter/Jenkinsfile
@@ -14,19 +14,12 @@ node('build-slave') {
                 } else
                     println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
             }
-            checkout scm
-            if (params.github_release_tag == "") {
-                checkout scm
-                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim()
-                build_tag = branch_name + "_" + commit_hash + "_" + env.BUILD_NUMBER
-                println(ANSI_BOLD + ANSI_YELLOW + "Tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL)
-            } else {
-                def scmVars = checkout scm
-                checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/$params.github_release_tag"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
-                build_tag = params.github_release_tag + "_" +  env.BUILD_NUMBER
-                println(ANSI_BOLD + ANSI_YELLOW + "Tag specified, building from tag: " + params.github_release_tag + ANSI_NORMAL)
-            }
+
+            cleanWs()
+            def scmVars = checkout scm
+            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
             echo "build_tag: " + build_tag
 
             stage('Build') {
diff --git a/images/kafka-topic-exporter/Jenkinsfile b/images/kafka-topic-exporter/Jenkinsfile
index 7f23198a3..f5f383606 100644
--- a/images/kafka-topic-exporter/Jenkinsfile
+++ b/images/kafka-topic-exporter/Jenkinsfile
@@ -15,19 +15,11 @@ node('build-slave') {
                     println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
             }
             sh'[[ -d .git ]] && git clean -ffxd'
-            checkout scm
-            if (params.github_release_tag == "") {
-                checkout scm
-                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim()
-                build_tag = branch_name + "_" + commit_hash + "_" + env.BUILD_NUMBER
-                println(ANSI_BOLD + ANSI_YELLOW + "Tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL)
-            } else {
-                def scmVars = checkout scm
-                checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/$params.github_release_tag"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
-                build_tag = params.github_release_tag + "_" +  env.BUILD_NUMBER
-                println(ANSI_BOLD + ANSI_YELLOW + "Tag specified, building from tag: " + params.github_release_tag + ANSI_NORMAL)
-            }
+            
+            def scmVars = checkout scm
+            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
             echo "build_tag: " + build_tag
 
             stage('Build') {
diff --git a/images/kong/Jenkinsfile.build b/images/kong/Jenkinsfile.build
index c576900a3..666f40b1b 100644
--- a/images/kong/Jenkinsfile.build
+++ b/images/kong/Jenkinsfile.build
@@ -14,25 +14,12 @@ node('build-slave') {
                 } else
                     println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
             }
+            
             cleanWs()
-            if (params.github_release_tag == "") {
-                checkout scm
-                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim()
-                build_tag = branch_name + "_" + commit_hash
-                // Creating artifact version
-                artifact_version = branch_name + "_" + commit_hash
-                println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL)
-            } else {
-                def scmVars = checkout scm
-                checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/$params.github_release_tag"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
-                build_tag = params.github_release_tag
-                // Creating artifact version
-                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim()              
-                artifact_version = branch_name + "_" + commit_hash
-                println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag specified, building from github_release_tag: " + params.github_release_tag + ANSI_NORMAL)
-            }
+            def scmVars = checkout scm
+            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
             echo "build_tag: " + build_tag
 
             stage('Build') {
diff --git a/images/openbadger/Jenkinsfile b/images/openbadger/Jenkinsfile
index 54505a2a4..9d80ca31e 100644
--- a/images/openbadger/Jenkinsfile
+++ b/images/openbadger/Jenkinsfile
@@ -6,18 +6,6 @@ node('build-slave') {
         String ANSI_RED = "\u001B[31m"
         String ANSI_YELLOW = "\u001B[33m"
 
-        if (params.size() == 0){
-            properties([[$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false], parameters([string(defaultValue: '', description: '<font color=teal size=2>If you want to build from a tag, specify the tag name. If this parameter is blank, latest commit hash will be used to build</font>', name: 'tag', trim: false)])])
-
-            ansiColor('xterm') {
-                println (ANSI_BOLD + ANSI_GREEN + '''\
-                        First run of the job. Parameters created. Stopping the current build.
-                        Please trigger new build and provide parameters if required.
-                        '''.stripIndent().replace("\n"," ") + ANSI_NORMAL)
-            }
-            return
-        }
-
         ansiColor('xterm') {
             stage('Checkout') {
                 if (!env.hub_org) {
@@ -26,19 +14,12 @@ node('build-slave') {
                 } else
                     println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
             }
+            
             cleanWs()
-            if (params.github_release_tag == "") {
-                checkout scm
-                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim()
-                build_tag = branch_name + "_" + commit_hash
-                println(ANSI_BOLD + ANSI_YELLOW + "Tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL)
-            } else {
-                def scmVars = checkout scm
-                checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/$params.github_release_tag"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
-                build_tag = params.github_release_tag
-                println(ANSI_BOLD + ANSI_YELLOW + "Tag specified, building from tag: " + params.github_relase_tag + ANSI_NORMAL)
-            }
+            def scmVars = checkout scm
+            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
             echo "build_tag: " + build_tag
 
             stage('Build') {
diff --git a/images/proxy/Jenkinsfile b/images/proxy/Jenkinsfile
index 8b2839365..5c40cb72d 100644
--- a/images/proxy/Jenkinsfile
+++ b/images/proxy/Jenkinsfile
@@ -14,21 +14,12 @@ node('build-slave') {
                 } else
                     println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
             }
+            
             cleanWs()
-            if (params.github_release_tag == "") {
-                checkout scm
-                sh("git submodule update --init --recursive")
-                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim()
-                build_tag = branch_name + "_" + commit_hash + "_" + env.BUILD_NUMBER
-                println(ANSI_BOLD + ANSI_YELLOW + "Tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL)
-            } else {
-                def scmVars = checkout scm
-                checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/$params.github_release_tag"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
-                sh("git submodule update --init --recursive")
-                build_tag = params.github_release_tag + "_" +  env.BUILD_NUMBER
-                println(ANSI_BOLD + ANSI_YELLOW + "Tag specified, building from tag: " + params.github_release_tag + ANSI_NORMAL)
-            }
+            def scmVars = checkout scm
+            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
             echo "build_tag: " + build_tag
 
             stage('Build') {
diff --git a/pipelines/build/nodebb/Jenkinsfile b/pipelines/build/nodebb/Jenkinsfile
index f3e04f4e9..35a413b21 100644
--- a/pipelines/build/nodebb/Jenkinsfile
+++ b/pipelines/build/nodebb/Jenkinsfile
@@ -14,21 +14,13 @@ node('build-slave') {
                 }
                 else
                     println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
-                cleanWs()
-                if (params.github_release_tag == "") {
-                    checkout scm
-                    commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                    branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim()
-                    build_tag = branch_name + "_" + commit_hash
-                    println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL)
-                }
-                else {
-                    def scmVars = checkout scm
-                    checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/$params.github_release_tag"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
-                    build_tag = params.github_release_tag
-                    println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag specified, building from github_release_tag: " + params.github_release_tag + ANSI_NORMAL)
-                }
-                echo "build_tag: " + build_tag
+
+            cleanWs()
+            def scmVars = checkout scm
+            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
+            echo "build_tag: " + build_tag
             }
 
             stage('Build') {

From 350c241ab86c56e0cd9bfb1df7520904050cbae6 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Thu, 11 Feb 2021 12:11:09 +0000
Subject: [PATCH 163/184] removing nodebb host:port combo (#2222)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 ansible/inventory/env/group_vars/all.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index 450585df0..43ef0dad6 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -650,7 +650,6 @@ group_activity_agg_cache_enable: false
 # nodebb variables
 mongo_nodebb_host: "{{ groups['mongo'] | join(',')}}"
 sunbird_nodebb_storage_key: "{{ core_vault_sunbird_nodebb_storage_key }}"
-mongo_nodebb_host: "{{ groups['mongo'] | join(':27017,')}}:27017"
 kibana_service: "http://kibana.logging.svc.cluster.local:5601"
 sunbird_dial_repo_api_base_url: "http://{{dialservice_ip}}:9001"
 

From 8e67d1ef630eb5140bec8f54ee70d5276624e361 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <keshavprasadms@gmail.com>
Date: Thu, 11 Feb 2021 19:44:23 +0530
Subject: [PATCH 164/184] fix: issue / image in tag names (#2225)

---
 images/azure-ambari-prometheus-exporter/Jenkinsfile | 5 ++---
 images/kafka-topic-exporter/Jenkinsfile             | 5 ++---
 images/kong/Jenkinsfile.build                       | 5 ++---
 images/openbadger/Jenkinsfile                       | 5 ++---
 images/proxy/Jenkinsfile                            | 5 ++---
 pipelines/build/nodebb/Jenkinsfile                  | 5 ++---
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/images/azure-ambari-prometheus-exporter/Jenkinsfile b/images/azure-ambari-prometheus-exporter/Jenkinsfile
index 5339bcf50..650afbade 100644
--- a/images/azure-ambari-prometheus-exporter/Jenkinsfile
+++ b/images/azure-ambari-prometheus-exporter/Jenkinsfile
@@ -16,10 +16,9 @@ node('build-slave') {
             }
 
             cleanWs()
-            def scmVars = checkout scm
-            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            checkout scm
             commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
+            build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
             echo "build_tag: " + build_tag
 
             stage('Build') {
diff --git a/images/kafka-topic-exporter/Jenkinsfile b/images/kafka-topic-exporter/Jenkinsfile
index f5f383606..5bcfaf40e 100644
--- a/images/kafka-topic-exporter/Jenkinsfile
+++ b/images/kafka-topic-exporter/Jenkinsfile
@@ -16,10 +16,9 @@ node('build-slave') {
             }
             sh'[[ -d .git ]] && git clean -ffxd'
             
-            def scmVars = checkout scm
-            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            checkout scm
             commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
+            build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
             echo "build_tag: " + build_tag
 
             stage('Build') {
diff --git a/images/kong/Jenkinsfile.build b/images/kong/Jenkinsfile.build
index 666f40b1b..43f7bb08e 100644
--- a/images/kong/Jenkinsfile.build
+++ b/images/kong/Jenkinsfile.build
@@ -16,10 +16,9 @@ node('build-slave') {
             }
             
             cleanWs()
-            def scmVars = checkout scm
-            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            checkout scm
             commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
+            build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
             echo "build_tag: " + build_tag
 
             stage('Build') {
diff --git a/images/openbadger/Jenkinsfile b/images/openbadger/Jenkinsfile
index 9d80ca31e..7e74246ad 100644
--- a/images/openbadger/Jenkinsfile
+++ b/images/openbadger/Jenkinsfile
@@ -16,10 +16,9 @@ node('build-slave') {
             }
             
             cleanWs()
-            def scmVars = checkout scm
-            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            checkout scm
             commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
+            build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
             echo "build_tag: " + build_tag
 
             stage('Build') {
diff --git a/images/proxy/Jenkinsfile b/images/proxy/Jenkinsfile
index 5c40cb72d..e4baecee5 100644
--- a/images/proxy/Jenkinsfile
+++ b/images/proxy/Jenkinsfile
@@ -16,10 +16,9 @@ node('build-slave') {
             }
             
             cleanWs()
-            def scmVars = checkout scm
-            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            checkout scm
             commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
+            build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
             echo "build_tag: " + build_tag
 
             stage('Build') {
diff --git a/pipelines/build/nodebb/Jenkinsfile b/pipelines/build/nodebb/Jenkinsfile
index 35a413b21..0af6c05c7 100644
--- a/pipelines/build/nodebb/Jenkinsfile
+++ b/pipelines/build/nodebb/Jenkinsfile
@@ -16,10 +16,9 @@ node('build-slave') {
                     println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
 
             cleanWs()
-            def scmVars = checkout scm
-            checkout scm: [$class: 'GitSCM', branches: [[name: "${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+            checkout scm
             commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-            build_tag = params.github_release_tag.split('/')[2] + "_" + commit_hash + "_" +  env.BUILD_NUMBER
+            build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
             echo "build_tag: " + build_tag
             }
 

From 8a2f56d5080798897fe10add1340262244ebba25 Mon Sep 17 00:00:00 2001
From: keshavprasadms <keshavprasadms@gmail.com>
Date: Thu, 11 Feb 2021 20:21:46 +0530
Subject: [PATCH 165/184] fix: updating release-3.6.0 jenkins jobs

---
 deploy/jenkins/jenkins-jobs-setup.sh          |   1 +
 .../jobs/dev/jobs/Core/config.xml             |   6 +-
 .../dev/jobs/Core/jobs/Assessment/config.xml  |  10 +-
 .../dev/jobs/Core/jobs/Content/config.xml     |   4 +-
 .../{OfflineInstaller => Dial}/config.xml     |  26 +-
 .../jobs/Core/jobs/DiscussionsMW/config.xml   | 108 ++++++++
 .../dev/jobs/Core/jobs/Keycloak/config.xml    |  12 +-
 .../dev/jobs/Core/jobs/KnowledgeMW/config.xml |  10 +-
 .../jobs/dev/jobs/Core/jobs/Nodebb/config.xml |  23 +-
 .../dev/jobs/Core/jobs/NodebbUI/config.xml    |  93 +++++++
 .../jobs/dev/jobs/Core/jobs/Player/config.xml |  10 +-
 .../jobs/SparkHdclusterExporter/config.xml    | 108 ++++++++
 .../DataPipeline/jobs/ApiModule/config.xml    |   2 +-
 .../jobs/FlinkPipelineJobs/config.xml         |  10 +-
 .../DataPipeline/jobs/MLWorkbench/config.xml  |   2 +-
 .../KnowledgePlatform/jobs/Dial/config.xml    |  10 +-
 .../jobs/FlinkJobs/config.xml                 |  10 +-
 .../jobs/KnowledgePlatform/config.xml         |   4 +-
 .../KnowledgePlatform/jobs/Yarn/config.xml    |   4 +-
 deploy/jenkins/jobs/Build/config.xml          |  14 +-
 .../jenkins/jobs/Build/jobs/Core/config.xml   |   6 +-
 .../jobs/Core/jobs/APIManager/config.xml      |  28 ++-
 .../jobs/Core/jobs/APIManagerEcho/config.xml  |  38 ---
 .../jobs/APIManagerEcho_Backup/config.xml     |  38 ---
 .../jobs/Core/jobs/AdminUtils/config.xml      |  24 +-
 .../Build/jobs/Core/jobs/Analytics/config.xml |  33 ++-
 .../jobs/Core/jobs/ApiManagerEcho/config.xml  |  23 +-
 .../jobs/Core/jobs/Assessment/config.xml      |  33 ++-
 .../Build/jobs/Core/jobs/Badger/config.xml    |  34 +--
 .../jobs/Build/jobs/Core/jobs/Bot/config.xml  |  92 +++++++
 .../Build/jobs/Core/jobs/Cassandra/config.xml |  33 ++-
 .../Core/jobs/CassandraDecrypt/config.xml     |  23 +-
 .../jobs/Build/jobs/Core/jobs/Cert/config.xml |  28 +--
 .../Core/jobs/CertRegistryService/config.xml  |  30 +--
 .../Build/jobs/Core/jobs/Content/config.xml   |  40 +--
 .../jobs/Build/jobs/Core/jobs/Dial/config.xml |  80 ++++++
 .../jobs/DiscussionsMiddleware/config.xml     |  31 +--
 .../jobs/Core/jobs/EncService/config.xml      |  27 +-
 .../Build/jobs/Core/jobs/Groups/config.xml    |  32 +--
 .../Core/jobs/Hawkeye-superset/config.xml     |  23 +-
 .../Build/jobs/Core/jobs/Keycloak/config.xml  |  31 +--
 .../jobs/Core/jobs/KnowledgeMW/config.xml     |  40 +--
 .../Build/jobs/Core/jobs/Learner/config.xml   |  40 +--
 .../jobs/Build/jobs/Core/jobs/Lms/config.xml  |  35 ++-
 .../Build/jobs/Core/jobs/Nodebb/config.xml    |  35 ++-
 .../jobs/Core/jobs/NodebbUI}/config.xml       |  48 ++--
 .../jobs/Core/jobs/Notification/config.xml    |  30 +--
 .../Core/jobs/OfflineInstaller/config.xml     |  33 ++-
 .../PlatformCoursesFunctionalTest/config.xml  |  23 +-
 .../Build/jobs/Core/jobs/Player/config.xml    |  44 ++--
 .../Build/jobs/Core/jobs/Print/config.xml     |  32 +--
 .../Build/jobs/Core/jobs/Proxy/config.xml     |  18 +-
 .../Build/jobs/Core/jobs/Report/config.xml    |  27 +-
 .../Build/jobs/Core/jobs/Router/config.xml    |  92 +++++++
 .../Build/jobs/Core/jobs/Search/config.xml    |  42 ++--
 .../jobs/SparkHdclusterExporter}/config.xml   |  60 +++--
 .../Build/jobs/Core/jobs/Taxonomy/config.xml  |  42 ++--
 .../Build/jobs/Core/jobs/Telemetry/config.xml |  32 +--
 .../Build/jobs/Core/jobs/UserOrg/config.xml   |  28 ++-
 .../jobs/Build/jobs/Core/jobs/Yarn/config.xml |  42 ++--
 .../DataPipeline/jobs/AdhocScripts/config.xml |  53 ++--
 .../DataPipeline/jobs/Analytics/config.xml    |  53 ++--
 .../jobs/AnalyticsCore/config.xml             |  42 ++--
 .../jobs/AnalyticsService/config.xml          |  53 ++--
 .../DataPipeline/jobs/ApiModule/config.xml    |  28 ++-
 .../jobs/CoreDataProducts/config.xml          |  40 +--
 .../DataPipeline/jobs/DataPipeline/config.xml |  53 ++--
 .../DataPipeline/jobs/DataReplay/config.xml   |  30 ++-
 .../jobs/DataPipeline/jobs/ETLJobs/config.xml |  22 +-
 .../jobs/EdDataProducts/config.xml            |  40 +--
 .../jobs/FlinkPipelineJobs/config.xml         |  35 ++-
 .../jobs/MLWorkbench}/config.xml              |  26 +-
 .../jobs/DataPipeline/jobs/Secor/config.xml   |  53 ++--
 .../jobs/Build/jobs/Experiments/config.xml    |  29 ---
 .../jobs/Experiments/jobs/dev/config.xml      |  29 ---
 .../jobs/dev/jobs/Experiments/config.xml      |  29 ---
 .../dev/jobs/Experiments/jobs/exp1/config.xml | 121 ---------
 .../dev/jobs/Experiments/jobs/exp2/config.xml | 121 ---------
 .../dev/jobs/Experiments/jobs/exp3/config.xml |  26 --
 .../jobs/Experiments_Job_Generator/config.xml |  85 -------
 .../Build/jobs/FunctionalTests/config.xml     |  28 ---
 .../jobs/FunctionalTests/jobs/Core/config.xml |  28 ---
 .../jobs/CassandraTrigger/config.xml          |  20 +-
 .../KnowledgePlatform/jobs/Dial/config.xml    |  39 ++-
 .../jobs/FlinkJobs/config.xml                 |  34 ++-
 .../jobs/KnowledgePlatform/config.xml         |  37 ++-
 .../jobs/LPFuntionalTest/config.xml           | 109 --------
 .../KnowledgePlatform/jobs/Neo4j/config.xml   |  25 +-
 .../jobs/SyncTool/config.xml                  |  35 ++-
 .../KnowledgePlatform/jobs/Yarn/config.xml    |  50 ++--
 .../Plugins/jobs/CollectionEditor/config.xml  |  31 +--
 .../Plugins/jobs/ContentEditor/config.xml     |  31 +--
 .../Plugins/jobs/ContentPlayer/config.xml     |  33 ++-
 .../Plugins/jobs/ContentPlugins/config.xml    |  31 +--
 .../Plugins/jobs/GenericEditor/config.xml     |  31 +--
 deploy/jenkins/jobs/Deploy/config.xml         |   9 +-
 .../jobs/Deploy/jobs/dev/jobs/Core/config.xml |   8 +-
 .../dev/jobs/Core/jobs/AdminUtils/config.xml  | 148 -----------
 .../dev/jobs/Core/jobs/Assessment/config.xml  | 150 -----------
 .../jobs/dev/jobs/Core/jobs/Badger/config.xml | 139 -----------
 .../dev/jobs/Core/jobs/Bootstrap/config.xml   | 112 ---------
 .../Core/jobs/BootstrapMongodb/config.xml     |   8 +-
 .../jobs/CF-QUML_Migration_Script/config.xml  |   4 +-
 .../Core/jobs/CassandraDecrypt/config.xml     | 214 ----------------
 .../jobs/dev/jobs/Core/jobs/Cert/config.xml   | 150 -----------
 .../Core/jobs/CertRegistryService/config.xml  | 148 -----------
 .../jobs/dev/jobs/Core/jobs/Config/config.xml | 137 ----------
 .../{Lms => DiscussionsMiddleware}/config.xml |  40 +--
 .../dev/jobs/Core/jobs/EncService/config.xml  | 148 -----------
 .../dev/jobs/Core/jobs/KafkaSetup/config.xml  |  56 ++---
 .../jobs/Core/jobs/KeycloakCustom/config.xml  | 115 ---------
 .../Core/jobs/KeycloakMigration/config.xml    | 173 -------------
 .../jobs/Core/jobs/KeycloakRealm/config.xml   |  56 ++---
 .../dev/jobs/Core/jobs/KnowledgeMW/config.xml | 150 -----------
 .../dev/jobs/Core/jobs/Monitoring/config.xml  |   6 +-
 .../jobs/Core/jobs/Notification/config.xml    | 148 -----------
 .../dev/jobs/Core/jobs/OnboardAPIs/config.xml | 124 ---------
 .../Core/jobs/OnboardConsumers/config.xml     | 117 ---------
 .../dev/jobs/Core/jobs/PlayerCDN/config.xml   | 157 ------------
 .../jobs/dev/jobs/Core/jobs/Print/config.xml  | 150 -----------
 .../jobs/dev/jobs/Core/jobs/Proxy/config.xml  | 143 -----------
 .../dev/jobs/Core/jobs/Telemetry/config.xml   | 148 -----------
 .../Core/jobs/TelemetryLogstash/config.xml    | 115 ---------
 .../Core/jobs/UploadPortalLabel/config.xml    | 189 --------------
 .../jobs/dev/jobs/Core/jobs/Yarn/config.xml   | 235 ------------------
 .../dev/jobs/Core/jobs/YarnOld/config.xml     | 234 -----------------
 .../Core/jobs/offlineInstaller/config.xml     |   2 +-
 .../jobs/Core/jobs/user-Keycloak/config.xml   | 214 ----------------
 .../jobs/dev/jobs/DataPipeline/config.xml     |   8 +-
 .../DataPipeline/jobs/AdhocScripts/config.xml |   2 +-
 .../DataPipeline/jobs/AnalyticsAPI/config.xml |   2 +-
 .../jobs/AnalyticsCore/config.xml             |  42 ++--
 .../config.xml                                |   2 +-
 .../jobs/AnalyticsReplayJobs/config.xml       |  17 +-
 .../jobs/AnalyticsService/config.xml          |   2 +-
 .../jobs/AnalyticsStartJobManager/config.xml  |   4 +-
 .../jobs/AnalyticsSubmitJobs/config.xml       |   4 +-
 .../DataPipeline/jobs/ApiModule/config.xml    |   4 +-
 .../jobs/CassandraDbUpdate/config.xml         |  54 ++--
 .../jobs/CoreDataProducts/config.xml          |  40 +--
 .../DataPipeline/jobs/DataProducts/config.xml | 100 ++++----
 .../jobs/DataReplayJob/config.xml             |   4 +-
 .../jobs/DataReplayScript/config.xml          |   2 +-
 .../jobs/DataproductsConfigUpdate/config.xml  |   4 +-
 .../jobs/DruidIngestion/config.xml            |  57 ++++-
 .../jobs/DruidSummaryMonthlyRollup/config.xml |   2 +-
 .../jobs/Druid_Health_Check/config.xml        |   4 +-
 .../Druid_ingestion_health_check/config.xml   |   2 +-
 .../Druid_segment_health_check/config.xml     |   2 +-
 .../jobs/ETLDruidContentIndexer/config.xml    |  42 ++--
 .../jobs/DataPipeline/jobs/ETLJobs/config.xml |  53 ++--
 .../jobs/ETLUserCacheIndexer/config.xml       |  40 +--
 .../jobs/EdDataProducts/config.xml            |  40 +--
 .../jobs/FlinkPipelineJobs/config.xml         |  37 +--
 .../GraphitePrometheusExporter/config.xml     |   2 +-
 .../DataPipeline/jobs/InternalKong/config.xml |   2 +-
 .../DataPipeline/jobs/KafkaIndexer/config.xml |  26 +-
 .../DataPipeline/jobs/KafkaSetup/config.xml   |  54 ++--
 .../jobs/DataPipeline/jobs/Logging/config.xml |   4 +-
 .../jobs/LoggingFileBeatsVM/config.xml        |  10 +-
 .../DataPipeline/jobs/Monitoring/config.xml   |   4 +-
 .../config.xml                                |   4 +-
 .../PipelineFlinkSummaryDenormStop/config.xml |   4 +-
 .../DataPipeline/jobs/RunReportJob/config.xml |   4 +-
 .../jobs/SamzaTelemetrySchemas/config.xml     |   2 +-
 .../jobs/DataPipeline/jobs/Secor/config.xml   | 128 +++++-----
 .../DataPipeline/jobs/SecorFlink/config.xml   | 226 -----------------
 .../jobs/SubmitReportJob/config.xml           |   2 +-
 .../jobs/DataPipeline/jobs/Yarn/config.xml    |   2 +-
 .../dev/jobs/KnowledgePlatform/config.xml     |   6 +-
 .../jobs/CassandraDbUpdate/config.xml         |   2 +-
 .../KnowledgePlatform/jobs/Dial/config.xml    |  42 ++--
 .../jobs/FlinkJobs/config.xml                 |  38 +--
 .../jobs/InsertQRCode/config.xml              |   2 +-
 .../jobs/KafkaSetup/config.xml                |  24 +-
 .../jobs/Learning/config.xml                  |   6 +-
 .../jobs/LoggingFileBeatsVM/config.xml        |  10 +-
 .../jobs/Monitoring/config.xml                | 129 ----------
 .../KnowledgePlatform/jobs/Neo4j/config.xml   |  98 ++++----
 .../jobs/Neo4jDefinitionUpdate/config.xml     |  24 +-
 .../Neo4jElasticSearchSyncTool/config.xml     |   2 +-
 .../KnowledgePlatform/jobs/Search/config.xml  | 226 -----------------
 .../jobs/SyncQRCode/config.xml                |   2 +-
 .../KnowledgePlatform/jobs/Yarn/config.xml    |  42 ++--
 .../jobs/dev/jobs/Kubernetes/config.xml       |   6 +-
 .../Kubernetes/jobs/APIManager/config.xml     |  22 +-
 .../Kubernetes/jobs/AdminUtils/config.xml     |  22 +-
 .../jobs/Kubernetes/jobs/Analytics/config.xml |  22 +-
 .../Kubernetes/jobs/Assessment/config.xml     |  22 +-
 .../jobs/Kubernetes/jobs/Badger/config.xml    |  58 ++---
 .../jobs/BootstrapCluster/config.xml          |   2 +-
 .../jobs/BootstrapMinimal/config.xml          |  80 +++++-
 .../jobs/Bot}/config.xml                      |  25 +-
 .../jobs/Kubernetes/jobs/Cassandra/config.xml |  40 +--
 .../jobs/CassandraDBUpdate/config.xml         |   2 +-
 .../dev/jobs/Kubernetes/jobs/Cert/config.xml  |  22 +-
 .../Kubernetes/jobs/CertRegistry/config.xml   |  22 +-
 .../jobs/Kubernetes/jobs/Content/config.xml   |  22 +-
 .../jobs/Dial}/config.xml                     |  49 ++--
 .../Kubernetes/jobs/DiscussionsMW/config.xml  | 159 ++++++++++++
 .../dev/jobs/Kubernetes/jobs/Enc/config.xml   |  22 +-
 .../jobs/FuntionalTestCases/config.xml        |   2 +-
 .../jobs/Kubernetes/jobs/Groups/config.xml    |   4 +-
 .../jobs/Hawkeye-superset/config.xml          |   2 +-
 .../jobs/Kubernetes/jobs/Keycloak/config.xml  |  42 ++--
 .../jobs/KeycloakMigration/config.xml         |   4 +-
 .../Kubernetes/jobs/KnowledgeMW/config.xml    |  24 +-
 .../jobs/KongJWTAdminUtil/config.xml          |  24 +-
 .../jobs/Kubernetes/jobs/Learner/config.xml   |  24 +-
 .../dev/jobs/Kubernetes/jobs/Lms/config.xml   |  24 +-
 .../jobs/Kubernetes/jobs/Logging/config.xml   |  24 +-
 .../jobs/LoggingFileBeatsVM/config.xml        |  10 +-
 .../Kubernetes/jobs/Monitoring/config.xml     |   8 +-
 .../Kubernetes/jobs/NetworkConfig/config.xml  |   2 +-
 .../jobs/Kubernetes/jobs/Nodebb/config.xml    |  24 +-
 .../jobs/NodebbUI}/config.xml                 | 157 +++++-------
 .../Kubernetes/jobs/Notification/config.xml   |  22 +-
 .../Kubernetes/jobs/OnboardAPIs/config.xml    |  24 +-
 .../jobs/OnboardConsumers/config.xml          |  20 +-
 .../jobs/Kubernetes/jobs/Player/config.xml    |  26 +-
 .../dev/jobs/Kubernetes/jobs/Print/config.xml |  58 ++---
 .../jobs/Kubernetes/jobs/Report/config.xml    |   2 +-
 .../jobs/Router}/config.xml                   |  27 +-
 .../jobs/Kubernetes/jobs/Search/config.xml    |   2 +-
 .../jobs/Kubernetes/jobs/Taxonomy/config.xml  |  24 +-
 .../jobs/Kubernetes/jobs/Telemetry/config.xml |  58 ++---
 .../jobs/UploadChatbotConfig}/config.xml      |  62 +++--
 .../Kubernetes/jobs/UploadSchema/config.xml   |  26 +-
 .../dev/jobs/Kubernetes/jobs/Yarn/config.xml  | 128 +++++-----
 .../jobs/nginx-private-ingress/config.xml     |  22 +-
 .../jobs/nginx-public-ingress/config.xml      |  24 +-
 .../jobs/redis}/config.xml                    |  50 ++--
 .../Plugins/jobs/CollectionEditor/config.xml  |   2 +-
 .../Plugins/jobs/ContentEditor/config.xml     |   2 +-
 .../Plugins/jobs/ContentPlayer/config.xml     | 100 ++++----
 .../Plugins/jobs/ContentPlugins/config.xml    | 103 ++++----
 .../Plugins/jobs/GenericEditor/config.xml     |   2 +-
 .../org_sunbird_questionunit_quml/config.xml  | 200 ---------------
 .../jenkins/jobs/OpsAdministration/config.xml |   8 +-
 .../ApplicationElasticsearchBackup/config.xml |   2 +-
 .../config.xml                                |   2 +-
 .../jobs/Core/jobs/CassandraBackup/config.xml |   2 +-
 .../dev/jobs/Core/jobs/CreateUser/config.xml  |   4 +-
 .../jobs/Core/jobs/GrafanaBackup/config.xml   |   2 +-
 .../jobs/Core/jobs/JenkinsBackup/config.xml   |   2 +-
 .../jobs/LoggerElasticSearchBackup/config.xml |   2 +-
 .../jobs/ManagedPostgresBackup/config.xml     |   2 +-
 .../Core/jobs/PostgresqlBackup/config.xml     |   2 +-
 .../Core/jobs/PostgresqlRestore/config.xml    |   2 +-
 .../Core/jobs/PrometheusBackup/config.xml     |   2 +-
 .../Core/jobs/PrometheusSanpshot/config.xml   |   2 +-
 .../dev/jobs/Core/jobs/RedisBackup/config.xml |   2 +-
 .../jobs/Core/jobs/SwarmBootstrap/config.xml  | 113 ---------
 .../jobs/CassandraBackup/config.xml           |   2 +-
 .../jobs/CassandraRestore/config.xml          |   2 +-
 .../jobs/DruidPostgresBackup/config.xml       |   2 +-
 .../jobs/ElasticsearchBackup/config.xml       |   2 +-
 .../jobs/ElasticsearchRestore/config.xml      |   2 +-
 .../jobs/InfluxDBBackup/config.xml            |   4 +-
 .../jobs/Influxdb_restore/config.xml          |   2 +-
 .../DataPipeline/jobs/MonitDeploy/config.xml  |   4 +-
 .../jobs/PostgresqlBackup/config.xml          |   2 +-
 .../jobs/PostgresqlRestore/config.xml         |   2 +-
 .../DataPipeline/jobs/RedisBackup/config.xml  |   4 +-
 .../jobs/RestartSecorJobs/config.xml          |   2 +-
 .../jobs/SamzaJobsAlert/config.xml            |   2 +-
 .../jobs/SamzaJobsKill/config.xml             |   2 +-
 .../jobs/SamzaOrphanprocessAlert/config.xml   |   2 +-
 .../jobs/DataPipeline/jobs/Test/config.xml    |  39 ---
 .../jobs/redis-restore/config.xml             |   4 +-
 .../jobs/CassandraBackup/config.xml           |   4 +-
 .../jobs/ElasticsearchBackup/config.xml       |   4 +-
 .../jobs/ElasticsearchRestore/config.xml      |   2 +-
 .../KnowledgePlatform/jobs/Health/config.xml  |   2 +-
 .../jobs/Neo4jBackup/config.xml               |   2 +-
 .../jobs/RedisBackup/config.xml               |   4 +-
 deploy/jenkins/jobs/Provision/config.xml      |   8 +-
 .../Provision/jobs/dev/jobs/Core/config.xml   |   8 +-
 .../dev/jobs/Core/jobs/Cassandra/config.xml   |  52 ++--
 .../jobs/dev/jobs/Core/jobs/LogES/config.xml  |  28 +--
 .../jobs/Core/jobs/MongodbCluster/config.xml  |   8 +-
 .../dev/jobs/Core/jobs/Postgres/config.xml    |  60 +++--
 .../Core/jobs/PostgresDbUpdate/config.xml     |  56 ++---
 .../jobs/dev/jobs/Core/jobs/Redis/config.xml  |   2 +-
 .../jobs/Core/jobs/user-keycloak/config.xml   | 115 ---------
 .../jobs/AnalyticsSecor/config.xml            |  60 +++--
 .../jobs/AnalyticsSpark/config.xml            |  22 +-
 .../jobs/DataPipeline/jobs/Druid/config.xml   |  34 ++-
 .../jobs/DataPipeline/jobs/Yarn/config.xml    |  52 ++--
 .../jobs/postgres-managed/config.xml          |  22 +-
 .../jobs/CompositeSearch/config.xml           |  52 ++--
 .../KnowledgePlatform/jobs/Kafka/config.xml   |  56 ++---
 .../jobs/Learning/config.xml                  |  58 +++--
 .../KnowledgePlatform/jobs/Neo4j/config.xml   |  56 ++---
 .../jobs/Zookeeper/config.xml                 |  60 +++--
 295 files changed, 3761 insertions(+), 8361 deletions(-)
 rename deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/{OfflineInstaller => Dial}/config.xml (83%)
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/DiscussionsMW/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/NodebbUI/config.xml
 create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/SparkHdclusterExporter/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
 rename deploy/jenkins/jobs/{Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices => Build/jobs/Core/jobs/NodebbUI}/config.xml (59%)
 create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
 rename deploy/jenkins/jobs/Build/jobs/{KnowledgePlatform/jobs/LP_Decoupling_Test => Core/jobs/SparkHdclusterExporter}/config.xml (51%)
 rename deploy/jenkins/jobs/Build/jobs/{FunctionalTests/jobs/Core/jobs/Content => DataPipeline/jobs/MLWorkbench}/config.xml (85%)
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/{Lms => DiscussionsMiddleware}/config.xml (85%)
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{Core/jobs/APIManager => Kubernetes/jobs/Bot}/config.xml (89%)
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{Core/jobs/Learner => Kubernetes/jobs/Dial}/config.xml (83%)
 create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{Core => Kubernetes}/jobs/LoggingFileBeatsVM/config.xml (95%)
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{Core/jobs/OfflineInstaller => Kubernetes/jobs/NodebbUI}/config.xml (76%)
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{Core/jobs/Player => Kubernetes/jobs/Router}/config.xml (89%)
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{Core/jobs/UploadDesktopFaq => Kubernetes/jobs/UploadChatbotConfig}/config.xml (77%)
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{Core/jobs/Content => Kubernetes/jobs/redis}/config.xml (78%)
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml
 delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml
 delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml
 delete mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml

diff --git a/deploy/jenkins/jenkins-jobs-setup.sh b/deploy/jenkins/jenkins-jobs-setup.sh
index 4cfb90ec7..17b6e2af5 100755
--- a/deploy/jenkins/jenkins-jobs-setup.sh
+++ b/deploy/jenkins/jenkins-jobs-setup.sh
@@ -23,6 +23,7 @@ setupJobs(){
       find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type f -name config.xml -exec sed -i "s#Deploy/dev/#Deploy/${arr[0]}/#g" {} \;
    fi
    find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's/<upstreamProjects>.*//g' {} \;
+   find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's/refs/heads/${public_repo_branch}/refs/tags/${public_repo_branch}/g' {} \;
    echo -e "\e[0;33m${bold}Jobs created for ${arr[0]}${normal}"
 
    for key in "${!arr[@]}"; do
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml
index 92618cba9..56424f5bf 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml
@@ -1,11 +1,11 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.16"/>
+      <registry plugin="docker-commons@1.17"/>
     </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml
index dc2b9069b..57fd20755 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml
index 3cd813b45..5919c15e3 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Dial/config.xml
similarity index 83%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Dial/config.xml
index a68c1ef3a..0de239fd7 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Dial/config.xml
@@ -13,9 +13,9 @@
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -28,23 +28,23 @@
         <hudson.model.StringParameterDefinition>
           <name>absolute_job_path</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>Build/Core/OfflineInstaller</defaultValue>
+          <defaultValue>Build/Core/Dial</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>build_number</name>
-          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
               <string>ArtifactRepo</string>
-              <string>JenkinsJob</string>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
@@ -64,7 +64,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
           <spec/>
-          <upstreamProjects>Build/Core/OfflineInstaller</upstreamProjects>
+          <upstreamProjects>/Build/Core/Dial</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -100,9 +100,9 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/upload/artifacts/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/DiscussionsMW/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/DiscussionsMW/config.xml
new file mode 100644
index 000000000..6eac98442
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/DiscussionsMW/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/DiscussionsMiddleware</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>Build/Core/DiscussionsMiddleware</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>1</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
index 825932b1b..d6b675bfb 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -15,7 +15,7 @@
         <daysToKeep>-1</daysToKeep>
         <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
+        <artifactNumToKeep>5</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -50,7 +50,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
index b8352ba77..dc35c777b 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml
index e74f85cc5..4887782fa 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml
@@ -1,13 +1,14 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -34,7 +35,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
+          <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -50,20 +51,20 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
+          <spec></spec>
           <upstreamProjects>/Build/Core/Nodebb</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -75,8 +76,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +95,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/NodebbUI/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/NodebbUI/config.xml
new file mode 100644
index 000000000..07421d92e
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/NodebbUI/config.xml
@@ -0,0 +1,93 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/NodebbUI</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>build_number</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>lastSuccessfulBuild</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+              <string>JenkinsJob</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/NodebbUI</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>pipelines/upload/plugins/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml
index d14adf080..5d18ec991 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/SparkHdclusterExporter/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/SparkHdclusterExporter/config.xml
new file mode 100644
index 000000000..a6e1211e9
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/SparkHdclusterExporter/config.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>Build/Core/SparkHdclusterExporter</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>artifact_source</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
+ArtifactRepo - Push the docker image to container registry.
+&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>ArtifactRepo</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>/Build/Core/SparkHdclusterExporter</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${public_repo_branch}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
index 82bdc7efc..e559caff7 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -80,7 +80,7 @@ ArtifactRepo - Push the docker image to container registry.
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
index d05493d86..78602a563 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
index 953421f03..590eab1e2 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -80,7 +80,7 @@ ArtifactRepo - Push the docker image to container registry.
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
index b3ae96700..855324d31 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
index 4742bdeff..1aa83cd9d 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
index 8f9797800..274954ef2 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index 4d6a32c85..ab7ab5619 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Build/config.xml b/deploy/jenkins/jobs/Build/config.xml
index e794546f9..b4e3e19ff 100644
--- a/deploy/jenkins/jobs/Build/config.xml
+++ b/deploy/jenkins/jobs/Build/config.xml
@@ -1,8 +1,18 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.14">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
-  <properties/>
+  <properties>
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+      <dockerLabel></dockerLabel>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+    <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.6.3">
+      <configs class="sorted-set">
+        <comparator class="org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty$1"/>
+      </configs>
+    </org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty>
+  </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
       <hudson.model.AllView>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/config.xml
index 92618cba9..56424f5bf 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/config.xml
@@ -1,11 +1,11 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.16"/>
+      <registry plugin="docker-commons@1.17"/>
     </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
index e0d29e22d..2ee342e3d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -11,13 +11,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -27,9 +33,12 @@
       <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -41,13 +50,10 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions/>
     </scm>
     <scriptPath>images/kong/Jenkinsfile.build</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho/config.xml
deleted file mode 100644
index a441e6b66..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho/config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.67">
-    <script>node(){
-        build_tag=&quot;1.5.0-gold&quot;
-        name=&quot;echo-server&quot;
-        node=env.NODE_NAME
-        org=env.hub_org
-        
-     sh &quot;&quot;&quot;
-        docker pull sunbird/echo-server:1.5.0-gold
-        docker tag sunbird/echo-server:1.5.0-gold ${org}/echo-server:${build_tag}
-        &quot;&quot;&quot;
-writeFile file: &apos;metadata.json&apos;, text: &apos;{ &quot;image_name&quot; : &quot;echo-server&quot;, &quot;image_tag&quot; : &quot;&apos; + build_tag + &apos;&quot;, &quot;node_name&quot; : &quot;&apos; + node + &apos;&quot;}&apos;
-
-     archiveArtifacts artifacts: &apos;metadata.json&apos;, onlyIfSuccessful: true
-}</script>
-    <sandbox>true</sandbox>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml
deleted file mode 100644
index a441e6b66..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.67">
-    <script>node(){
-        build_tag=&quot;1.5.0-gold&quot;
-        name=&quot;echo-server&quot;
-        node=env.NODE_NAME
-        org=env.hub_org
-        
-     sh &quot;&quot;&quot;
-        docker pull sunbird/echo-server:1.5.0-gold
-        docker tag sunbird/echo-server:1.5.0-gold ${org}/echo-server:${build_tag}
-        &quot;&quot;&quot;
-writeFile file: &apos;metadata.json&apos;, text: &apos;{ &quot;image_name&quot; : &quot;echo-server&quot;, &quot;image_tag&quot; : &quot;&apos; + build_tag + &apos;&quot;, &quot;node_name&quot; : &quot;&apos; + node + &apos;&quot;}&apos;
-
-     archiveArtifacts artifacts: &apos;metadata.json&apos;, onlyIfSuccessful: true
-}</script>
-    <sandbox>true</sandbox>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
index a26017e13..db18bdc6e 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -47,8 +53,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -69,4 +75,4 @@
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
index 1f6d5991a..acf051f3a 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -26,13 +26,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -46,8 +52,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -59,17 +65,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
index 96d35d3ab..d5ae84a55 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
@@ -20,9 +20,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
@@ -53,17 +59,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
index f23ff671d..b964bd126 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -47,8 +53,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +66,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>build/assessment-service/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
index 5b2017152..0c80df220 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -28,39 +29,44 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
+          <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.80">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.75">
     <script>node(){
-        build_tag="1.8.0-gold"
-        name="badger"
+        build_tag=&quot;1.8.0-gold&quot;
+        name=&quot;badger&quot;
         node=env.NODE_NAME
         org=env.hub_org
         
-     sh """
+     sh &quot;&quot;&quot;
         docker pull sunbird/${name}:${build_tag}
         docker tag sunbird/${name}:${build_tag} ${org}/${name}:${build_tag}
-        """
-writeFile file: 'metadata.json', text: '{ "image_name" : "' + name + '", "image_tag" : "' + build_tag + '", "node_name" : "' + node + '"}'
+        &quot;&quot;&quot;
+writeFile file: &apos;metadata.json&apos;, text: &apos;{ &quot;image_name&quot; : &quot;&apos; + name + &apos;&quot;, &quot;image_tag&quot; : &quot;&apos; + build_tag + &apos;&quot;, &quot;node_name&quot; : &quot;&apos; + node + &apos;&quot;}&apos;
 
-     archiveArtifacts artifacts: 'metadata.json', onlyIfSuccessful: true
+     archiveArtifacts artifacts: &apos;metadata.json&apos;, onlyIfSuccessful: true
 }</script>
     <sandbox>true</sandbox>
   </definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
new file mode 100644
index 000000000..2f929ce38
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
@@ -0,0 +1,92 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>diksha_bot_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt; If the value is blank, master branch will be copied from diksha private repo. Specify github tag name to build from a tag &lt;br&gt;
+  keep empty to build from master &lt;br&gt;
+  &lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>diksha_bot_repo</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>https://github.com/DIKSHA-NCTE/Diksha-Bot.git</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-bot.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+    </scm>
+    <scriptPath>bot/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
index e93b6d0fb..d5561a6d0 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -52,8 +58,8 @@
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -65,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
index 949257c00..d5b3e1f4d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
@@ -27,9 +27,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>cassandra_jar_name</name>
@@ -70,17 +76,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile.decrypt</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
index 74e5873c3..7827ff6cc 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -33,7 +33,7 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +44,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +65,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
index d226d54c0..817f91b98 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -33,7 +33,9 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -42,11 +44,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +65,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
index 7def9cac2..c0ac7d044 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +50,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>build/content-service/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
new file mode 100644
index 000000000..6bef2fdef
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
@@ -0,0 +1,80 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-dial-service.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+    </scm>
+    <scriptPath>build/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
index 3c75acdec..c78e9744d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
@@ -27,9 +27,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
@@ -42,7 +48,7 @@
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.SCMTrigger>
@@ -57,29 +63,18 @@
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/Sunbird-Ed/discussions-middleware</url>
+          <url>https://github.com/Sunbird-Ed/discussions-middleware.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
index 1113115fa..09f25266f 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -27,25 +28,31 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
+          <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -63,7 +70,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
index aaf6e8d80..6d7f0e3b5 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -42,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>* * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -58,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
index 1f7728a61..6c28e412b 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
@@ -20,9 +20,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
@@ -58,17 +64,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
index c4f17ac8c..1609b070d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -20,13 +20,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -45,8 +51,8 @@
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +64,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
index edf3983a7..aef65a707 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -20,13 +20,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -35,11 +43,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -51,17 +64,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
index 8d26ae1f1..3e305126d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +50,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
index 4aa49ef4d..19e1ed81e 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -45,8 +53,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +66,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
index f02fabb46..9b2c31fc0 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
@@ -20,14 +20,20 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>nodebb_branch</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
+          <description/>
+          <defaultValue>master</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
@@ -46,12 +52,12 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-nodebb.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -59,19 +65,8 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
-    <scriptPath>pipelines/build/nodebb/Jenkinsfile</scriptPath>
+    <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
similarity index 59%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
index 915daeeb8..8480098b3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
@@ -1,7 +1,6 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -9,9 +8,10 @@
         <daysToKeep>-1</daysToKeep>
         <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
@@ -19,52 +19,48 @@
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
-          <name>service</name>
-          <description>&lt;b color:&quot;blue&quot;&gt;All will reload proxy and kong, proxy will reload proxy container configs, kong will reload kong container configs&lt;/b&gt;</description>
-          <defaultValue>proxy</defaultValue>
-          <trim>false</trim>
+          <name>github_release_tag</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/Sunbird-Ed/discussions-UI.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
+          <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
-    <scriptPath>pipelines/reloadConfigurations/Jenkinsfile</scriptPath>
+    <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
index 6116cd04f..cd07e3de3 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -33,7 +33,9 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -42,11 +44,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +65,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
index c05a06a6b..18e092b87 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
@@ -27,9 +27,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
@@ -47,34 +53,23 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal</url>
+          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-	  <name>${github_release_tag}</name>
+          <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile.desktop</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
index 94dd96265..b0634c473 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
@@ -27,9 +27,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
@@ -68,17 +74,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>lms_service_api_test/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
index a7ec05929..36db52e11 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,9 +27,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>sunbird_content_editor_artifact_url</name>
@@ -77,7 +83,9 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -86,15 +94,20 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal</url>
+          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -102,17 +115,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
index 0317d4a8b..d6893e327 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
@@ -20,13 +20,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -35,7 +43,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -51,17 +64,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
index d6a7b60a5..f4edbda67 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -21,27 +22,26 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
+          <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -59,7 +59,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
index ca135323c..9dc7e032f 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -50,7 +58,7 @@
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-report-service</url>
+          <url>https://github.com/project-sunbird/sunbird-report-service.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -58,17 +66,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
new file mode 100644
index 000000000..9f98c0ca4
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
@@ -0,0 +1,92 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>github_release_tag</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>diksha_bot_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt; If the value is blank, master branch will be copied from diksha private repo. Specify github tag name to build from a tag &lt;br&gt;
+  keep empty to build from master &lt;br&gt;
+  &lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>diksha_bot_repo</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>https://github.com/DIKSHA-NCTE/Diksha-Bot.git</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/sunbird-bot.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${github_release_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+    </scm>
+    <scriptPath>router/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
index e5472de67..c168a380a 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -42,11 +50,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>build/search-service/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LP_Decoupling_Test/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
similarity index 51%
rename from deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LP_Decoupling_Test/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
index 288e7b050..448f81e81 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LP_Decoupling_Test/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
@@ -8,7 +7,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -20,36 +19,46 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>profile_id</name>
-          <description>Select the profile_id</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>platform-services</string>
-              <string>learning-services</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -57,19 +66,8 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
-    <scriptPath>pipelines/build/learning/Jenkinsfile</scriptPath>
+    <scriptPath>images/azure-ambari-prometheus-exporter/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
index d6845b1e7..bd39e7d6e 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -42,11 +50,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>build/taxonomy-service/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
index 7d2435574..c255cd31c 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -42,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -58,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
index e942a4906..67a25d802 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<flow-definition plugin="workflow-job@2.32">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -19,6 +19,10 @@
         <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -29,12 +33,26 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
index 903fc54bd..479628163 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -42,11 +50,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>pipelines/build/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
index 7fadcf6e9..bdfdb2488 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
@@ -8,7 +7,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -20,22 +19,47 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -48,17 +72,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>python-scripts/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
index b5f6fe737..f3cfe2e3c 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
@@ -1,14 +1,13 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -20,21 +19,46 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
     <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
@@ -47,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
index 6c0648ca6..ca5c9e3d6 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,15 +50,20 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-analytics-core</url>
+          <url>https://github.com/project-sunbird/sunbird-analytics-core.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -60,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
index 49b4a521a..db20774b4 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
@@ -1,14 +1,13 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -20,21 +19,46 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
     <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
@@ -47,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
index 2ba32367d..8e7fd8c89 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<flow-definition plugin="workflow-job@2.36">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,6 +20,10 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -30,12 +34,26 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
index 550b6da99..1b26e4a40 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +50,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
index 0777c5d77..dd7e2ea0e 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
@@ -1,14 +1,13 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -20,21 +19,46 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
     <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
@@ -47,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>pipelines/build/data-pipeline/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
index 2cc421723..1861774cf 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<flow-definition plugin="workflow-job@2.36">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,6 +20,10 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -30,16 +34,30 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/sowmya-dixit/sunbird-data-products.git</url>
+          <url>https://github.com/Sunbird-Ed/sunbird-data-products.git</url>
           <credentialsId>githubHarsha</credentialsId>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
index 94e0a87ee..e7a2a57d3 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -11,13 +11,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -28,12 +34,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/sunbird-Ed/sunbird-data-products.git</url>
+          <url>https://github.com/Sunbird-Ed/sunbird-data-products.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
index 4c52f1ccf..f98360f2d 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +50,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>data-products/build.Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
index 037195360..0d0c947b8 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -45,8 +53,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +66,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>kubernetes/pipelines/build/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
similarity index 85%
rename from deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/jobs/Content/config.xml
rename to deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
index 3cf2aa50e..178ee53de 100644
--- a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -1,13 +1,14 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.31">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -19,7 +20,7 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -28,31 +29,30 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
+          <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/knowledge-platform.git</url>
+          <url>https://github.com/project-sunbird/sunbird-ml-workbench.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -66,13 +66,13 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>functional-tests/content/Jenkinsfile</scriptPath>
+    <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
index e17986031..086918d9b 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
@@ -1,14 +1,13 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -20,21 +19,46 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
     <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
@@ -47,17 +71,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/config.xml
deleted file mode 100644
index 5be56a4e0..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.8">
-  <actions/>
-  <description></description>
-  <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
-      <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.14"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
-  </properties>
-  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
-    <views>
-      <hudson.model.AllView>
-        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
-        <name>All</name>
-        <filterExecutors>false</filterExecutors>
-        <filterQueue>false</filterQueue>
-        <properties class="hudson.model.View$PropertyList"/>
-      </hudson.model.AllView>
-    </views>
-    <tabBar class="hudson.views.DefaultViewsTabBar"/>
-  </folderViews>
-  <healthMetrics>
-    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-      <nonRecursive>false</nonRecursive>
-    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-  </healthMetrics>
-  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
-</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml
deleted file mode 100644
index 37e2c9b17..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
-  <actions/>
-  <description></description>
-  <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.9">
-      <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
-  </properties>
-  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
-    <views>
-      <hudson.model.AllView>
-        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
-        <name>All</name>
-        <filterExecutors>false</filterExecutors>
-        <filterQueue>false</filterQueue>
-        <properties class="hudson.model.View$PropertyList"/>
-      </hudson.model.AllView>
-    </views>
-    <tabBar class="hudson.views.DefaultViewsTabBar"/>
-  </folderViews>
-  <healthMetrics>
-    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-      <nonRecursive>false</nonRecursive>
-    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-  </healthMetrics>
-  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
-</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml
deleted file mode 100644
index 37e2c9b17..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
-  <actions/>
-  <description></description>
-  <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.9">
-      <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
-  </properties>
-  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
-    <views>
-      <hudson.model.AllView>
-        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
-        <name>All</name>
-        <filterExecutors>false</filterExecutors>
-        <filterQueue>false</filterQueue>
-        <properties class="hudson.model.View$PropertyList"/>
-      </hudson.model.AllView>
-    </views>
-    <tabBar class="hudson.views.DefaultViewsTabBar"/>
-  </folderViews>
-  <healthMetrics>
-    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-      <nonRecursive>false</nonRecursive>
-    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-  </healthMetrics>
-  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
-</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml
deleted file mode 100644
index 471add90f..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.33">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>exp1</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>exp1</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>portal_branch_name</name>
-          <description></description>
-          <defaultValue>release-2.2.0</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>portal_repo_url</name>
-          <description></description>
-          <defaultValue>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${github_release_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/player-experiments/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml
deleted file mode 100644
index d8dcbf422..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.33">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>exp2</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>exp2</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>portal_branch_name</name>
-          <description></description>
-          <defaultValue>portal-experiments</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>portal_repo_url</name>
-          <description></description>
-          <defaultValue>https://github.com/G33tha/SunbirdEd-portal.git</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>${portal_repo_url}</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${github_release_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>Experiments/experiments.Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml
deleted file mode 100644
index 295f773de..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><flow-definition>
-    <actions/>
-    <description/>
-    <keepDependencies>false</keepDependencies>
-    <properties/>
-    <triggers/>
-    <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition">
-        <scriptPath>experiments/experiments.Jenkinsfile</scriptPath>
-        <lightweight>false</lightweight>
-        <scm class="hudson.plugins.git.GitSCM">
-            <userRemoteConfigs>
-                <hudson.plugins.git.UserRemoteConfig>
-                    <url>https://github.com/G33tha/SunbirdEd-portal.git</url>
-                </hudson.plugins.git.UserRemoteConfig>
-            </userRemoteConfigs>
-            <branches>
-                <hudson.plugins.git.BranchSpec>
-                    <name>portal-experiments</name>
-                </hudson.plugins.git.BranchSpec>
-            </branches>
-            <configVersion>2</configVersion>
-            <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-            <gitTool>Default</gitTool>
-        </scm>
-    </definition>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml
deleted file mode 100644
index 74790c6bf..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>experiment_job_name</name>
-          <description>job name or experiment name</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>repo_url</name>
-          <description>ex  : https://github.com/${account_name}/SunbirdEd-portal.git</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>branch_name</name>
-          <description></description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <canRoam>true</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers/>
-  <concurrentBuild>false</concurrentBuild>
-  <builders>
-    <javaposse.jobdsl.plugin.ExecuteDslScripts plugin="job-dsl@1.76">
-      <scriptText>def jobname = &quot;${experiment_job_name}&quot;
-def repo = &quot;${repo_url}&quot;
-def branch = &quot;${branch_name}&quot;
-
-pipelineJob(&quot;Experiments/dev/Experiments/${jobname}&quot;) {
-
-    definition {
-    cpsScm {
-      scm {
-        git {
-          remote { url(repo) }
-          branches(branch)
-          scriptPath(&apos;experiments/experiments.Jenkinsfile&apos;)
-        }
-      }
-   }
-  }
-}</scriptText>
-      <usingScriptText>true</usingScriptText>
-      <sandbox>false</sandbox>
-      <ignoreExisting>false</ignoreExisting>
-      <ignoreMissingFiles>false</ignoreMissingFiles>
-      <failOnMissingPlugin>false</failOnMissingPlugin>
-      <failOnSeedCollision>false</failOnSeedCollision>
-      <unstableOnDeprecation>false</unstableOnDeprecation>
-      <removedJobAction>IGNORE</removedJobAction>
-      <removedViewAction>IGNORE</removedViewAction>
-      <removedConfigFilesAction>IGNORE</removedConfigFilesAction>
-      <lookupStrategy>JENKINS_ROOT</lookupStrategy>
-    </javaposse.jobdsl.plugin.ExecuteDslScripts>
-  </builders>
-  <publishers/>
-  <buildWrappers/>
-</project>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml b/deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml
deleted file mode 100644
index fb78197dd..000000000
--- a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
-  <description></description>
-  <properties>
-    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
-      <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.16"/>
-    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
-  </properties>
-  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
-    <views>
-      <hudson.model.AllView>
-        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
-        <name>All</name>
-        <filterExecutors>false</filterExecutors>
-        <filterQueue>false</filterQueue>
-        <properties class="hudson.model.View$PropertyList"/>
-      </hudson.model.AllView>
-    </views>
-    <tabBar class="hudson.views.DefaultViewsTabBar"/>
-  </folderViews>
-  <healthMetrics>
-    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-      <nonRecursive>false</nonRecursive>
-    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-  </healthMetrics>
-  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
-</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml b/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml
deleted file mode 100644
index fb78197dd..000000000
--- a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
-  <description></description>
-  <properties>
-    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
-      <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.16"/>
-    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
-  </properties>
-  <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
-    <views>
-      <hudson.model.AllView>
-        <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
-        <name>All</name>
-        <filterExecutors>false</filterExecutors>
-        <filterQueue>false</filterQueue>
-        <properties class="hudson.model.View$PropertyList"/>
-      </hudson.model.AllView>
-    </views>
-    <tabBar class="hudson.views.DefaultViewsTabBar"/>
-  </folderViews>
-  <healthMetrics>
-    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-      <nonRecursive>false</nonRecursive>
-    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
-  </healthMetrics>
-  <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
-</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
index e9c657cf3..541decf0a 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -28,25 +29,26 @@
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
+          <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -64,7 +66,7 @@
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
index fb61d20cc..4b8a63492 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -45,12 +53,12 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-dial-service</url>
+          <url>https://github.com/project-sunbird/sunbird-dial-service.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -58,19 +66,8 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
-    <scriptPath>Jenkinsfile</scriptPath>
+    <scriptPath>build/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
index 41a9eadcd..4ee763736 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -47,12 +53,13 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
           <url>https://github.com/project-sunbird/knowledge-platform-jobs.git</url>
+          <credentialsId>githubPassword</credentialsId>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -60,17 +67,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>kubernets/pipelines/build/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
index a33487e18..669fd7a5f 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,9 +27,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>profile_id</name>
@@ -43,7 +49,9 @@
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -55,12 +63,12 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform</url>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -68,17 +76,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>pipelines/build/learning/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml
deleted file mode 100644
index 8338d7a5c..000000000
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_service_url</name>
-          <description></description>
-          <defaultValue>http://11.2.4.22:8080/learning-service</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_content_creator_password</name>
-          <description></description>
-          <defaultValue>password</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_content_reviewer_password</name>
-          <description></description>
-          <defaultValue>password</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_search_base_url</name>
-          <description></description>
-          <defaultValue>http://11.2.6.6/search</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_dial_base_url</name>
-          <description></description>
-          <defaultValue>https://qa.ekstep.in/api</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_dial_auth_key</name>
-          <description></description>
-          <defaultValue>eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI2MzExMTYwNTMzOGY0Zjc5YTgwZTM3YjcyZjVjMmUwZiJ9.azmj_AHmndeJz0h6yIkOJz1XjeZR6Gzd-OrZzR66I0A</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_cs_uri</name>
-          <description></description>
-          <defaultValue>http://11.2.6.6/content</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-functional-tests.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${github_release_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>kp_service_test/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index e8f69cfc3..e590a76b6 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -58,17 +66,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>pipelines/build/neo4j/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
index 0f8cf822d..a75d59ad4 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -45,8 +53,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +66,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>pipelines/build/synctool/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index ff889ff72..9d513a1ff 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -42,15 +50,26 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>KnowledgePlatform</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform</url>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -58,17 +77,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>pipelines/build/yarn/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
index 9349be357..abaa8251d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -20,13 +20,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -40,8 +46,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -53,17 +59,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
index e59dc31c4..81102057e 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -20,13 +20,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -40,8 +46,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -53,17 +59,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
index 2719e4d27..bb4518076 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -20,13 +20,21 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
@@ -38,8 +46,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -51,17 +59,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
index b53b66fe2..bb7111df4 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -20,13 +20,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -40,8 +46,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -53,17 +59,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
index c1a37d63e..f86f5dd9d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -20,13 +20,19 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -40,8 +46,8 @@
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -53,17 +59,6 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>false</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Deploy/config.xml b/deploy/jenkins/jobs/Deploy/config.xml
index e794546f9..68477b8ac 100644
--- a/deploy/jenkins/jobs/Deploy/config.xml
+++ b/deploy/jenkins/jobs/Deploy/config.xml
@@ -1,8 +1,13 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.14">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
   <actions/>
   <description></description>
-  <properties/>
+  <properties>
+    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
+      <dockerLabel></dockerLabel>
+      <registry plugin="docker-commons@1.13"/>
+    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+  </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
       <hudson.model.AllView>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml
index ca27afff7..56424f5bf 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.5.0-rc1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.17"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
deleted file mode 100644
index 298ff2b71..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/AdminUtils</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.53">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.53">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>AdminUtils</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.53">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.53">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>AdminUtils</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/AdminUtils</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/adminutils/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml
deleted file mode 100644
index bd554ea42..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Assessment</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Assessment</projectName>
-          <projectFullName>Deploy/dev/Core/Assessment</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Assessment</projectName>
-          <projectFullName>Deploy/dev/Core/Assessment</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/Assessment</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-2.7.0</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/assessment/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml
deleted file mode 100644
index 5bdde924e..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Badger</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Badger</projectName>
-          <projectFullName>Deploy/dev/Core/Badger</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Badger</projectName>
-          <projectFullName>Deploy/dev/Core/Badger</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-2.2.0_RC11</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/badger/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
deleted file mode 100644
index 76712ca41..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>hosts</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Enter the host name to be bootstrapped.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>all</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.53">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.53">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Bootstrap</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.53">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.53">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Bootstrap</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions/>
-    </scm>
-    <scriptPath>pipelines/bootstrap/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml
index c37ca3a3f..ca084b756 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml
@@ -38,7 +38,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>BootstrapMongodb</projectName>
-          <projectFullName>Provision/dev/Core/BootstrapMongodb</projectFullName>
+          <projectFullName>Deploy/dev/Core/BootstrapMongodb</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -65,7 +65,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>BootstrapMongodb</projectName>
-          <projectFullName>Provision/dev/Core/BootstrapMongodb</projectFullName>
+          <projectFullName>Deploy/dev/Core/BootstrapMongodb</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -91,7 +91,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
+    
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
     <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
@@ -123,4 +123,4 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
index e166158a8..e633d3a3f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
@@ -66,12 +66,12 @@
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</url>
+          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal.git.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>quml-mogration-2.10</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml
deleted file mode 100644
index f784ffd5a..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/CassandraDecrypt</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-9600649228560</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
-]</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>CassandraDecrypt</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>PT_SINGLE_SELECT</choiceType>
-          <filterable>false</filterable>
-          <filterLength>1</filterLength>
-        </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>build_number</name>
-          <description></description>
-          <randomName>choice-parameter-9600651313765</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-{ 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>CassandraDecrypt</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>artifact_version</name>
-          <description></description>
-          <randomName>choice-parameter-9600653373369</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-} 
-else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>CassandraDecrypt</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>CassandraDecrypt</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>CassandraDecrypt</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/CassandraDecrypt</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml
deleted file mode 100644
index cf9509468..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Cert</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Cert</projectName>
-          <projectFullName>Deploy/dev/Core/Cert</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Cert</projectName>
-          <projectFullName>Deploy/dev/Core/Cert</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/Cert</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/cert/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
deleted file mode 100644
index ee1bfcb08..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/CertRegistryService</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>CertRegistryService</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>CertRegistryService</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/CertRegistryService</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/cert-registry-service/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml
deleted file mode 100644
index 40c3e9754..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Config</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.53">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.53">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Config</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.53">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.53">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Config</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/config-service/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/DiscussionsMiddleware/config.xml
similarity index 85%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/DiscussionsMiddleware/config.xml
index c63aa7263..b6b3651bb 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/DiscussionsMiddleware/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -28,7 +28,7 @@
         <hudson.model.StringParameterDefinition>
           <name>absolute_job_path</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Lms</defaultValue>
+          <defaultValue>ArtifactUpload/dev/Core/KnowledgeMW</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,25 +51,25 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Lms</projectName>
-          <projectFullName>Deploy/dev/Core/Lms</projectFullName>
+          <projectName>DiscussionsMiddleware</projectName>
+          <projectFullName>Deploy/dev/Core/DiscussionsMiddleware</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,13 +78,13 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Lms</projectName>
-          <projectFullName>Deploy/dev/Core/Lms</projectFullName>
+          <projectName>DiscussionsMiddleware</projectName>
+          <projectFullName>Deploy/dev/Core/DiscussionsMiddleware</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -92,7 +92,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -106,7 +106,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
           <spec/>
-          <upstreamProjects>ArtifactUpload/dev/Core/Lms</upstreamProjects>
+          <upstreamProjects>ArtifactUpload/dev/Core/KnowledgeMW</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -117,8 +117,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -127,7 +127,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>summary-aggregate</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -137,12 +137,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <shallow>true</shallow>
           <noTags>false</noTags>
           <reference/>
-          <depth>1</depth>
+          <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/deploy/lms/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/deploy/knowledge-mw-service/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml
deleted file mode 100644
index 307fc4c50..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/EncService</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>EncService</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>EncService</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/EncService</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/enc/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml
index bd98aec0f..a1bcf8308 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.34">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -25,74 +26,71 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-188157054642539</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaSetup</projectName>
-          <projectFullName>Deploy/dev/Core/KafkaSetup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-188157057910170</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaSetup</projectName>
-          <projectFullName>Deploy/dev/Core/KafkaSetup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_UNORDERED_LIST</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -101,7 +99,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -110,7 +108,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml
deleted file mode 100644
index 0038bd043..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-196487835595646</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KeycloakAddClients</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-196487838166797</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KeycloakAddClients</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/keycloak/Jenkinsfile.custom</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml
deleted file mode 100644
index 0cdecbe4f..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-9600649228560</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
-]</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KeycloakMigration</projectName>
-          <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>PT_SINGLE_SELECT</choiceType>
-          <filterable>false</filterable>
-          <filterLength>1</filterLength>
-        </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>build_number</name>
-          <description></description>
-          <randomName>choice-parameter-9600651313765</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-{ 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KeycloakMigration</projectName>
-          <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>artifact_version</name>
-          <description></description>
-          <randomName>choice-parameter-9600653373369</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-} 
-else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KeycloakMigration</projectName>
-          <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KeycloakMigration</projectName>
-          <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-2.7.0</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions/>
-    </scm>
-    <scriptPath>pipelines/deploy/keycloak-migration/Jenkinsfile</scriptPath>
-    <lightweight>true</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml
index 7eb30d0c1..0674ca952 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -19,83 +20,80 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-186662917593857</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KeycloakRealm</projectName>
-          <projectFullName>Deploy/dev/Core/KeycloakRealm</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-186662921061407</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KeycloakRealm</projectName>
-          <projectFullName>Deploy/dev/Core/KeycloakRealm</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +111,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
deleted file mode 100644
index 46e23f702..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/KnowledgeMW</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KnowledgeMW</projectName>
-          <projectFullName>Deploy/dev/Core/KnowledgeMW</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KnowledgeMW</projectName>
-          <projectFullName>Deploy/dev/Core/KnowledgeMW</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/KnowledgeMW</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-2.9.0</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/knowledge-mw-service/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml
index dcab0240d..c04722d03 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml
@@ -102,8 +102,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -112,7 +112,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>sunbird-monitoring-release-3.5.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml
deleted file mode 100644
index 659441700..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Notification</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Notification</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Notification</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/Notification</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/notification/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml
deleted file mode 100644
index a122d804d..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-117346587048120</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>OnboardAPIs</projectName>
-          <projectFullName>Deploy/dev/Core/OnboardAPIs</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-117346594984751</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>OnboardAPIs</projectName>
-          <projectFullName>Deploy/dev/Core/OnboardAPIs</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-2.7.0</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/am-onboard-apis/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml
deleted file mode 100644
index 44efa4f3e..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-186788940114941</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>OnboardConsumers</projectName>
-          <projectFullName>Deploy/dev/Core/OnboardConsumers</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-186788943531283</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>OnboardConsumers</projectName>
-          <projectFullName>Deploy/dev/Core/OnboardConsumers</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-2.7.0</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/am-onboard-consumers/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml
deleted file mode 100644
index 1a32fe801..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.38">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Player</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>PlayerCDN</projectName>
-          <projectFullName>Deploy/dev/Core/PlayerCDN</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>PlayerCDN</projectName>
-          <projectFullName>Deploy/dev/Core/PlayerCDN</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>cdn_enable</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Select true to enable CDN build, false to disable CDN build&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>false</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/Player</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/player-cdn/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml
deleted file mode 100644
index a59ba36be..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Print</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Print</projectName>
-          <projectFullName>Deploy/dev/Core/Print</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Print</projectName>
-          <projectFullName>Deploy/dev/Core/Print</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/Print</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-2.7.0</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/print-service/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml
deleted file mode 100644
index 686734361..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
-  <actions/>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Proxy</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
-          <name>private_branch</name>
-          <description/>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Proxy</projectName>
-          <projectFullName>Deploy/dev/Core/Proxy</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
-          <name>branch_or_tag</name>
-          <description/>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
-
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Proxy</projectName>
-          <projectFullName>Deploy/dev/Core/Proxy</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
-          <upstreamProjects>ArtifactUpload/dev/Core/Proxy</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/proxy/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
deleted file mode 100644
index 122d8aded..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Telemetry</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Telemetry</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Telemetry</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/Telemetry</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/telemetry/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml
deleted file mode 100644
index ef548d986..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description>Deploys Telemetry Logstash Service</description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-186827048551040</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>TelemetryLogstash</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-186827051364357</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>TelemetryLogstash</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/telemetry-logstash/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml
deleted file mode 100644
index 42e8c9e0e..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
-  <actions/>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
-          <name>private_branch</name>
-          <description/>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>UploadPortalLabel</projectName>
-          <projectFullName>Deploy/dev/Core/UploadPortalLabel</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
-          <name>branch_or_tag</name>
-          <description/>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
-
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>UploadPortalLabel</projectName>
-          <projectFullName>Deploy/dev/Core/UploadPortalLabel</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>desktop_container</name>
-          <description/>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>label</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>destination_path</name>
-          <description/>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>all_labels_ta.json</string>
-              <string>all_labels_bn.json</string>
-              <string>all_labels_en.json</string>
-              <string>all_labels_hi.json</string>
-              <string>all_labels_kn.json</string>
-              <string>all_labels_mr.json</string>
-              <string>all_labels_te.json</string>
-              <string>all_labels_ur.json</string>
-              <string>all_labels_gu.json</string>
-              <string>all_labels_ml.json</string>
-              <string>all_labels_as.json</string>
-              <string>all_labels_or.json</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>src_file_path</name>
-          <description/>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>utils/portal/labels/all_labels_ta.json</string>
-              <string>utils/portal/labels/all_labels_bn.json</string>
-              <string>utils/portal/labels/all_labels_en.json</string>
-              <string>utils/portal/labels/all_labels_hi.json</string>
-              <string>utils/portal/labels/all_labels_kn.json</string>
-              <string>utils/portal/labels/all_labels_mr.json</string>
-              <string>utils/portal/labels/all_labels_te.json</string>
-              <string>utils/portal/labels/all_labels_ur.json</string>
-              <string>utils/portal/labels/all_labels_gu.json</string>
-              <string>utils/portal/labels/all_labels_ml.json</string>
-              <string>utils/portal/labels/all_labels_as.json</string>
-              <string>utils/portal/labels/all_labels_or.json</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>tag</name>
-          <description/>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>upload-label</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
-          <upstreamProjects/>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-	  <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/desktop-faq/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml
deleted file mode 100644
index 10a02619b..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Yarn</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-9061667106947</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
-]</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>PT_SINGLE_SELECT</choiceType>
-          <filterable>false</filterable>
-          <filterLength>1</filterLength>
-        </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>build_number</name>
-          <description></description>
-          <randomName>choice-parameter-9061670571657</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-{ 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>artifact_version</name>
-          <description></description>
-          <randomName>choice-parameter-9061673103864</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-} 
-else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
-          <name>job_names_to_deploy</name>
-          <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the samza app names to deploy and this will kill the selected samza app and deploy them. Multi selection is available.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-8026182213525059</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>return [&apos;lms.user-account-merger_1&apos;,
-&apos;lms.sso-account-updater_1&apos;,
-&apos;lms.indexer_1&apos;,
-&apos;lms.notification-job_1&apos;]</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>PT_MULTI_SELECT</choiceType>
-          <filterable>false</filterable>
-          <filterLength>1</filterLength>
-        </org.biouno.unochoice.CascadeChoiceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/yarn/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml
deleted file mode 100644
index e14279a74..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Yarn</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-9061667106947</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
-]</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>PT_SINGLE_SELECT</choiceType>
-          <filterable>false</filterable>
-          <filterLength>1</filterLength>
-        </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>build_number</name>
-          <description></description>
-          <randomName>choice-parameter-9061670571657</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-{ 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>artifact_version</name>
-          <description></description>
-          <randomName>choice-parameter-9061673103864</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-} 
-else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
-          <name>job_names_to_deploy</name>
-          <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the samza app names to deploy and this will kill the selected samza app and deploy them. Multi selection is available.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-8026182213525059</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>return [&apos;lms.user-account-merger_1&apos;,
-&apos;lms.sso-account-updater_1&apos;,
-&apos;lms.indexer_1&apos;]</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Yarn</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>PT_MULTI_SELECT</choiceType>
-          <filterable>false</filterable>
-          <filterLength>1</filterLength>
-        </org.biouno.unochoice.CascadeChoiceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/yarn/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
index bd1b7a068..b51ad0803 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
@@ -115,7 +115,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>test</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml
deleted file mode 100644
index 1292b42c0..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-9600649228560</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
-]</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>user-Keycloak</projectName>
-          <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>PT_SINGLE_SELECT</choiceType>
-          <filterable>false</filterable>
-          <filterLength>1</filterLength>
-        </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>build_number</name>
-          <description></description>
-          <randomName>choice-parameter-9600651313765</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-{ 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>user-Keycloak</projectName>
-          <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>artifact_version</name>
-          <description></description>
-          <randomName>choice-parameter-9600653373369</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-} 
-else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>user-Keycloak</projectName>
-          <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>user-Keycloak</projectName>
-          <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>user-Keycloak</projectName>
-          <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>sunbird_auth_branch_or_tag</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbird auth repo.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>release-1.15_RC9</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/keycloak/Jenkinsfile.user</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml
index 6a4f8d07e..baaac54e2 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml
@@ -1,11 +1,11 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.16"/>
+      <registry plugin="docker-commons@1.17"/>
     </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
@@ -35,7 +35,7 @@
         <refreshFrequency>3</refreshFrequency>
         <showPipelineDefinitionHeader>false</showPipelineDefinitionHeader>
       </au.com.centrumsystems.hudson.plugin.buildpipeline.BuildPipelineView>
-      <hudson.plugins.view.dashboard.Dashboard plugin="dashboard-view@2.12">
+      <hudson.plugins.view.dashboard.Dashboard plugin="dashboard-view@2.14">
         <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
         <name>dahs</name>
         <filterExecutors>false</filterExecutors>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
index 90b512478..1accb6201 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
@@ -204,7 +204,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.9.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
index 2a39d1b1f..a00904aee 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
@@ -202,7 +202,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.7.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
index aaf1954e3..d651caa1a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
           <defaultValue>ArtifactUpload/dev/DataPipeline/AnalyticsCore</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return[
 'JenkinsJob',
 'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("JenkinsJob")) {
 return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -74,7 +74,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -86,13 +86,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("ArtifactRepo")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
@@ -101,7 +101,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -113,13 +113,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -127,7 +127,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -139,13 +139,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -154,7 +154,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -170,7 +170,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <name>module</name>
           <description>
 &lt;font color=dimgray size=2&gt;&lt;b&gt;It will deploy only lpa_core_artifacts(analytics-core &amp; analytics-framework) jar.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>framework</defaultValue>
+          <defaultValue>framework,framework-spark-cluster</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
@@ -181,7 +181,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -206,8 +206,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml
index 9b5f1d1ae..508a3e200 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml
@@ -124,7 +124,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml
index c67809a5f..99c84de21 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml
@@ -43,6 +43,12 @@
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>job_id</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the job id.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>batch_identifier</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify The BatchId to Generate report for specific batch&lt;/b&gt;&lt;/font&gt;
@@ -127,17 +133,6 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>job_id</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Specify the job id.&lt;/b&gt;&lt;/font&gt;</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>progress-exhaust</string>
-              <string>userinfo-exhaust</string>
-              <string>response-exhaust</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
index f1b3a45ba..b607b8870 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
@@ -202,7 +202,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.2.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml
index d59080aeb..67095e7e8 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml
@@ -102,12 +102,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.8.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml
index 99d97a99a..70c3f6962 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml
@@ -102,12 +102,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>dataproducts-ansible-changes</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
index 392e4f983..ec2161179 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -150,12 +150,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>proxy-api</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml
index 312081ee3..2909fd2b3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.34">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -25,74 +26,71 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-188134496458577</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CassandraDbUpdate</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/CassandraDbUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-188134511232202</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.62">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.62">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CassandraDbUpdate</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/CassandraDbUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -110,7 +108,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
index f459c4832..776ce8d4b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
           <defaultValue>ArtifactUpload/dev/DataPipeline/CoreDataProducts</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return[
 'JenkinsJob',
 'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("JenkinsJob")) {
 return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -74,7 +74,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -86,13 +86,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("ArtifactRepo")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
@@ -101,7 +101,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -113,13 +113,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -127,7 +127,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -139,13 +139,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -154,7 +154,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -180,7 +180,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -205,8 +205,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml
index 8f09be5bc..d9aae9818 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -31,51 +32,51 @@
           <defaultValue>ArtifactUpload/dev/DataPipeline/Analytics</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.66">
               <script>return[
-'JenkinsJob',
-'ArtifactRepo'
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>DataProducts</projectName>
           <projectFullName>Deploy/dev/DataPipeline/DataProducts</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>build_number</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("JenkinsJob")) {
-return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
 { 
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -86,23 +87,23 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>artifact_version</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("ArtifactRepo")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 } 
 else {
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -113,75 +114,74 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>DataProducts</projectName>
           <projectFullName>Deploy/dev/DataPipeline/DataProducts</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>DataProducts</projectName>
           <projectFullName>Deploy/dev/DataPipeline/DataProducts</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
+          <spec></spec>
           <upstreamProjects>ArtifactUpload/dev/DataPipeline/AnalyticsCore</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -193,8 +193,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -212,7 +212,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml
index 2121bb596..ccd62da7b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml
@@ -125,12 +125,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.8.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml
index 55e382d7a..879ea624d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml
@@ -204,7 +204,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.8.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml
index 3d602c216..6dfcc5349 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml
@@ -114,12 +114,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.10.1</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml
index 530f33936..559927605 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -38,13 +38,13 @@ To stop task:  [stop-task]
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-193684482193674</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -52,7 +52,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -64,13 +64,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-193684493817846</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -79,7 +79,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -91,9 +91,44 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
+          <name>ingestion_task_names</name>
+          <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the Ingestion task names . Multi selection is available.&lt;/b&gt;&lt;/font&gt;</description>
+          <randomName>choice-parameter-5103950750484326</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>return ['telemetry_events',
+'summary_events',
+'telemetry_feedback_events',
+'offline_desktop']</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>DruidIngestion</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/DruidIngestion</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>PT_MULTI_SELECT</choiceType>
+          <filterable>false</filterable>
+          <filterLength>1</filterLength>
+        </org.biouno.unochoice.CascadeChoiceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>cluster</name>
+          <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the cluster name.&lt;/b&gt;&lt;/font&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>raw</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -107,8 +142,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml
index cba7924d7..c271716e2 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml
@@ -51,7 +51,7 @@
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml
index 27e6b355d..044d599f9 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml
@@ -42,12 +42,12 @@
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/RevathiKotla/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.8.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml
index f56940d47..974c02ec6 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml
@@ -47,7 +47,7 @@
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.8.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml
index 5315e4d56..6355467ed 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml
@@ -51,7 +51,7 @@
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.8.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml
index 6d9f4e68a..fed3bfe31 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
           <defaultValue>Deploy/dev/DataPipeline/ETLJobs</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return[
 'JenkinsJob',
 'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("JenkinsJob")) {
 return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -74,7 +74,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -86,13 +86,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("ArtifactRepo")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
@@ -101,7 +101,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -113,13 +113,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -127,7 +127,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -149,13 +149,13 @@ Default Druid content indexer job will run as cron.&lt;/b&gt;&lt;/font&gt;</desc
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -164,7 +164,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -188,7 +188,7 @@ If you select the "execute script from the invoke_type drop down then choose whi
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -206,8 +206,8 @@ If you select the "execute script from the invoke_type drop down then choose whi
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -216,7 +216,7 @@ If you select the "execute script from the invoke_type drop down then choose whi
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
index 3951b1ca1..3b6260b2f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -55,21 +55,21 @@ If you select the "execute script from the invoke_type drop down then choose whi
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return[
 'JenkinsJob',
 'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -82,13 +82,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("JenkinsJob")) {
 return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -98,7 +98,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -110,13 +110,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("ArtifactRepo")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
@@ -125,7 +125,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -137,13 +137,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -151,7 +151,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -163,13 +163,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -178,7 +178,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -192,7 +192,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -203,22 +203,11 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
-          <upstreamProjects>ArtifactUpload/dev/DataPipeline/ETLJobs</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml
index 169267af7..9c71585b4 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
           <defaultValue>Deploy/dev/DataPipeline/ETLJobs</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return[
 'JenkinsJob',
 'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("JenkinsJob")) {
 return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -74,7 +74,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -86,13 +86,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("ArtifactRepo")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
@@ -101,7 +101,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -113,13 +113,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -127,7 +127,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -149,13 +149,13 @@ user cache indexer script will run.&lt;/b&gt;&lt;/font&gt;</description>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -164,7 +164,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -209,7 +209,7 @@ Please select the action deploy or execute script.&lt;/b&gt;&lt;/font&gt;</descr
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -227,8 +227,8 @@ Please select the action deploy or execute script.&lt;/b&gt;&lt;/font&gt;</descr
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
index 800cf6995..0bb50872f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
           <defaultValue>ArtifactUpload/dev/DataPipeline/EdDataProducts</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return[
 'JenkinsJob',
 'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("JenkinsJob")) {
 return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -74,7 +74,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -86,13 +86,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("ArtifactRepo")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
@@ -101,7 +101,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -113,13 +113,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -127,7 +127,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -139,13 +139,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -154,7 +154,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -180,7 +180,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -205,8 +205,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
index 37878bceb..3ab889cb6 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -39,7 +39,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -66,7 +66,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -90,27 +90,28 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <defaultValue>ArtifactUpload/dev/DataPipeline/FlinkPipelineJobs</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>job_names_to_deploy</name>
           <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the job names to deploy. Multi-selection is available.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-1273072434092073</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return['telemetry-extractor',
 'pipeline-preprocessor',
+'de-normalization',
 'druid-validator',
 'assessment-aggregator',
 'content-cache-updater',
-'de-normalization-primary',
-'de-normalization-secondary',
+'user-cache-updater',
 'user-cache-updater-v2',
 'summary-denormalization',
 'error-denormalization',
+'ingest-router',
 'device-profile-updater']</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -125,7 +126,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.CascadeChoiceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -139,17 +140,17 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml
index bfe7fe3b6..d8ec22921 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml
@@ -104,7 +104,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml
index 371779b6f..cef5783bf 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml
@@ -157,7 +157,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.10.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml
index e599b6964..dfb51077d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-188153004575082</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -39,7 +39,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-188153015326365</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -66,7 +66,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -80,7 +80,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -91,17 +91,17 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>flink-logstash-setup</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml
index aa1b537b8..a2904cf39 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -25,74 +26,73 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-188157054642539</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaSetup</projectName>
           <projectFullName>Deploy/dev/DataPipeline/KafkaSetup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-188157057910170</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KafkaSetup</projectName>
           <projectFullName>Deploy/dev/DataPipeline/KafkaSetup</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_UNORDERED_LIST</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -110,7 +110,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml
index 490a9ba60..b3c1101d1 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml
@@ -117,12 +117,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/kaali09/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.2.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml
index 6d70dacf0..44bbccf00 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml
@@ -29,7 +29,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/DataPipeline/LoggingFileBeatsVM</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -56,7 +56,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/DataPipeline/LoggingFileBeatsVM</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/DataPipeline/LoggingFileBeatsVM</projectFullName>
           <choiceType>PT_MULTI_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
@@ -124,7 +124,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/DataPipeline/LoggingFileBeatsVM</projectFullName>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
@@ -172,4 +172,4 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
index 2f345e87e..c327603e7 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
@@ -111,12 +111,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.5.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml
index 95b4d9536..826a5af2f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml
@@ -111,12 +111,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml
index 6af02c041..02eb14816 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml
@@ -111,12 +111,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml
index 547afa219..3d5fc41ef 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml
@@ -102,12 +102,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/RevathiKotla/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.2.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml
index 6256fb7ba..211b54e44 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml
@@ -107,7 +107,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.9.1</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
index 293eb390e..2a813aae6 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
@@ -1,22 +1,21 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,156 +31,157 @@
           <defaultValue>ArtifactUpload/dev/DataPipeline/Secor</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.75">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Secor</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/Secor</projectFullName>
+          <projectName>SecorFlink</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.75">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Secor</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/Secor</projectFullName>
+          <projectName>SecorFlink</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.75">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Secor</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/Secor</projectFullName>
+          <projectName>SecorFlink</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Secor</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/Secor</projectFullName>
+          <projectName>SecorFlink</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Secor</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/Secor</projectFullName>
+          <projectName>SecorFlink</projectName>
+          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
+          <spec/>
           <upstreamProjects>ArtifactUpload/dev/DataPipeline/Secor</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -193,8 +193,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -212,13 +212,13 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/deploy/secor/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/deploy/secor/Jenkinsfile.flink</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml
deleted file mode 100644
index 619c3cac5..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/DataPipeline/Secor</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-9061667106947</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>return[
-'JenkinsJob',
-'ArtifactRepo'
-]</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>SecorFlink</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>PT_SINGLE_SELECT</choiceType>
-          <filterable>false</filterable>
-          <filterLength>1</filterLength>
-        </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
-          <name>build_number</name>
-          <description/>
-          <randomName>choice-parameter-9061670571657</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("JenkinsJob")) {
-return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
-}
-else
-{ 
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>SecorFlink</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
-          <name>artifact_version</name>
-          <description/>
-          <randomName>choice-parameter-9061673103864</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("ArtifactRepo")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
-} 
-else {
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>SecorFlink</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
-          <name>private_branch</name>
-          <description/>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>SecorFlink</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
-          <name>branch_or_tag</name>
-          <description/>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
-
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>SecorFlink</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
-          <upstreamProjects>ArtifactUpload/dev/DataPipeline/Secor</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/maheshkumargangula/sunbird-data-pipeline.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-3.1.0</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/secor/Jenkinsfile.flink</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml
index 182356ec8..9293f4f1b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml
@@ -131,7 +131,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.10.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
index 1001dab76..fd78bae64 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
@@ -239,7 +239,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.10.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml
index 92618cba9..56424f5bf 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml
@@ -1,11 +1,11 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.16"/>
+      <registry plugin="docker-commons@1.17"/>
     </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml
index 0700be4aa..1c15d443a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml
@@ -104,7 +104,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
index e4c0e725c..8bfb4117f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
           <defaultValue>ArtifactUpload/dev/KnowledgePlatform/Dial</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-14760318274338</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return[
 'JenkinsJob',
 'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
           <randomName>choice-parameter-14760320375443</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("JenkinsJob")) {
 return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -74,7 +74,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -86,13 +86,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
           <randomName>choice-parameter-14760322347747</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("ArtifactRepo")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
@@ -101,7 +101,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -113,13 +113,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -127,7 +127,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -139,13 +139,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -154,7 +154,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -168,7 +168,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -193,8 +193,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -203,7 +203,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
index 2ade74653..739b68603 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -39,7 +39,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -66,7 +66,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -90,22 +90,23 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <defaultValue>ArtifactUpload/dev/KnowledgePlatform/FlinkJobs</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>job_names_to_deploy</name>
           <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the job names to deploy. Multi-selection is available.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-1273072434092073</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return['activity-aggregate-updater',
 'relation-cache-updater',
 'post-publish-processor',
-'post-certificate-processor',
-'certificate-generator',
-'certificate-pre-processor']</script>
+'video-stream-generator',
+'questionset-publish',
+'collection-certificate-generator',
+'collection-complete-post-processor']</script>
               <sandbox>true</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -120,7 +121,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.CascadeChoiceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -134,17 +135,18 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
           <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+          <credentialsId>githubPassword</credentialsId>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>flink-fix</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml
index e8e72223a..4c85b3e4b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml
@@ -117,7 +117,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml
index 6aba98d05..cf30e9f43 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-188161640748171</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -39,7 +39,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-188161652021198</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -66,7 +66,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -80,7 +80,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -94,8 +94,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -104,7 +104,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
index a7e85c562..94ae1e870 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
@@ -193,8 +193,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -203,7 +203,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.5.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml
index 6d70dacf0..e39966704 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml
@@ -29,7 +29,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/LoggingFileBeatsVM</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -56,7 +56,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/LoggingFileBeatsVM</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/LoggingFileBeatsVM</projectFullName>
           <choiceType>PT_MULTI_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
@@ -124,7 +124,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/LoggingFileBeatsVM</projectFullName>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
@@ -172,4 +172,4 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
deleted file mode 100644
index cc7259165..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-188192452200864</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Monitoring</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-188192454133057</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Monitoring</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects></upstreamProjects>
-          <threshold>
-            <name>FAILURE</name>
-            <ordinal>2</ordinal>
-            <color>RED</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/monitor/KnowledgePlatform/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index 672697c8a..00b7bf6a7 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -31,51 +32,51 @@
           <defaultValue>ArtifactUpload/dev/KnowledgePlatform/Neo4j</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-13436883643465</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.66">
               <script>return[
-'JenkinsJob',
-'ArtifactRepo'
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>build_number</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-13436885688258</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("JenkinsJob")) {
-return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
 { 
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -86,23 +87,23 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>artifact_version</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-13436888536349</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("ArtifactRepo")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 } 
 else {
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -113,77 +114,76 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
           <projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -201,7 +201,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml
index 85bb8d7f5..6bd706bb9 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-188174424977419</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -39,7 +39,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-188174429374717</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -66,7 +66,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -80,7 +80,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -94,8 +94,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -104,7 +104,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml
index 186b91365..e4cea420b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml
@@ -227,7 +227,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
deleted file mode 100644
index 67cabd05f..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/KnowledgePlatform/KnowledgePlatform</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-14760318274338</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
-]</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Search</projectName>
-          <projectFullName>Deploy/dev/KnowledgePlatform/Search</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>PT_SINGLE_SELECT</choiceType>
-          <filterable>false</filterable>
-          <filterLength>1</filterLength>
-        </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>build_number</name>
-          <description></description>
-          <randomName>choice-parameter-14760320375443</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-{ 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Search</projectName>
-          <projectFullName>Deploy/dev/KnowledgePlatform/Search</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>artifact_version</name>
-          <description></description>
-          <randomName>choice-parameter-14760322347747</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-} 
-else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Search</projectName>
-          <projectFullName>Deploy/dev/KnowledgePlatform/Search</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Search</projectName>
-          <projectFullName>Deploy/dev/KnowledgePlatform/Search</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Search</projectName>
-          <projectFullName>Deploy/dev/KnowledgePlatform/Search</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/KnowledgePlatform/KnowledgePlatform</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-2.9.0</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/search/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml
index bda4633de..cc3350686 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml
@@ -104,7 +104,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index b6d9320d4..a64cf2d1b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
           <defaultValue>ArtifactUpload/dev/KnowledgePlatform/Yarn</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-2874232768088857</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return[
 'JenkinsJob',
 'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
           <randomName>choice-parameter-2874449088885218</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("JenkinsJob")) {
 return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -74,7 +74,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -86,13 +86,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
           <randomName>choice-parameter-2877900313772031</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("ArtifactRepo")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
@@ -101,7 +101,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -113,13 +113,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -127,7 +127,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -139,13 +139,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -154,7 +154,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -168,7 +168,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -193,8 +193,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -203,7 +203,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml
index 4506aeec7..228d20b4d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml
@@ -1,13 +1,13 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
       <dockerLabel></dockerLabel>
       <registry plugin="docker-commons@1.16"/>
     </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
-    <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.6.3">
+    <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.7.0">
       <configs class="sorted-set">
         <comparator class="org.jenkinsci.plugins.configfiles.ConfigByIdComparator"/>
       </configs>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml
index fe91de368..27d023b17 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml
index ebaedb2e3..bcc027f7d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml
index 48270103c..1f171d108 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml
index f0ecf32f7..3005e6146 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
index 5a49dbdce..a21614a8f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -34,84 +35,83 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
+          <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Badger</projectName>
           <projectFullName>Deploy/dev/Kubernetes/Badger</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Badger</projectName>
           <projectFullName>Deploy/dev/Kubernetes/Badger</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <hudson.model.StringParameterDefinition>
           <name>role_name</name>
-          <description/>
+          <description></description>
           <defaultValue>deploy-badger</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
+          <spec></spec>
           <upstreamProjects>ArtifactUpload/dev/Core/Badger</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -123,8 +123,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -142,7 +142,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml
index df5bc0fe5..cd562225f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml
@@ -104,7 +104,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.8.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml
index 86084333e..a0fcdd789 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<flow-definition plugin="workflow-job@2.36">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,12 +20,82 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>private_branch</name>
+          <description></description>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>BootstrapMinimal</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/BootstrapMinimal</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>branch_or_tag</name>
+          <description></description>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+
+}
+else
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>BootstrapMinimal</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/BootstrapMinimal</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters></referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit></paramsToUseForLimit>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -34,7 +104,7 @@
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Bot/config.xml
similarity index 89%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Bot/config.xml
index bf725fd9e..8e3a2f927 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Bot/config.xml
@@ -28,7 +28,7 @@
         <hudson.model.StringParameterDefinition>
           <name>absolute_job_path</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/APIManager</defaultValue>
+          <defaultValue>ArtifactUpload/dev/Core/Bot</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
@@ -56,8 +56,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>APIManager</projectName>
-          <projectFullName>Deploy/dev/Core/APIManager</projectFullName>
+          <projectName>Bot</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Bot</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -83,13 +83,22 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>APIManager</projectName>
-          <projectFullName>Deploy/dev/Core/APIManager</projectFullName>
+          <projectName>Bot</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Bot</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>chatbot</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
@@ -106,7 +115,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
           <spec/>
-          <upstreamProjects>ArtifactUpload/dev/Core/APIManager</upstreamProjects>
+          <upstreamProjects>ArtifactUpload/dev/Core/Bot</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -122,7 +131,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-bot.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -142,7 +151,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/deploy/api-manager/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/chatbot.Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml
index 8445a39d0..3f4cb8708 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -24,21 +24,21 @@
           <defaultValue>ArtifactUpload/dev/Core/Cassandra</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9600649228560</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return[
 'JenkinsJob',
 'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
           <randomName>choice-parameter-9600651313765</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("JenkinsJob")) {
 return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -67,7 +67,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -79,13 +79,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
           <randomName>choice-parameter-9600653373369</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("ArtifactRepo")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
@@ -94,7 +94,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -106,13 +106,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -120,7 +120,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -132,13 +132,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -147,7 +147,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -161,7 +161,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -186,8 +186,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -196,7 +196,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml
index cacaa806f..6d70cff16 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml
@@ -106,7 +106,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml
index e2fa6869f..84457796b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml
index d88da2db6..642ffe751 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml
index 8aa755cdc..778e89432 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Dial/config.xml
similarity index 83%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Dial/config.xml
index 406390f30..e635df4c1 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Dial/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -28,7 +28,7 @@
         <hudson.model.StringParameterDefinition>
           <name>absolute_job_path</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Learner</defaultValue>
+          <defaultValue>ArtifactUpload/dev/Core/Dial</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,25 +51,25 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Learner</projectName>
-          <projectFullName>Deploy/dev/Core/Learner</projectFullName>
+          <projectName>Dial</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Dial</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,21 +78,30 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Learner</projectName>
-          <projectFullName>Deploy/dev/Core/Learner</projectFullName>
+          <projectName>Dial</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Dial</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -106,7 +115,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
           <spec/>
-          <upstreamProjects>ArtifactUpload/dev/Core/Learner</upstreamProjects>
+          <upstreamProjects>ArtifactUpload/dev/Core/Dial</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -117,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -127,7 +136,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.2.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -137,12 +146,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <shallow>true</shallow>
           <noTags>false</noTags>
           <reference/>
-          <depth>1</depth>
+          <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/deploy/learner/Jenkinsfile</scriptPath>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml
new file mode 100644
index 000000000..9c9cc3c64
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml
@@ -0,0 +1,159 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>absolute_job_path</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>ArtifactUpload/dev/Core/DiscussionsMW</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>image_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>DiscussionsMW</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/DiscussionsMW</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>DiscussionsMW</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/DiscussionsMW</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>sunbird-deploy</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec/>
+          <upstreamProjects>ArtifactUpload/dev/Core/DiscussionsMW</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/project-sunbird/ntp-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>${branch_or_tag}</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions>
+        <hudson.plugins.git.extensions.impl.CloneOption>
+          <shallow>true</shallow>
+          <noTags>false</noTags>
+          <reference/>
+          <depth>0</depth>
+          <honorRefspec>false</honorRefspec>
+        </hudson.plugins.git.extensions.impl.CloneOption>
+      </extensions>
+    </scm>
+    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml
index 7c79c007c..a70c0171a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
index 3db5484d4..86917858d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
@@ -46,7 +46,7 @@
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-functional-tests.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
index 619cd6c34..b6cbc95e4 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
@@ -131,12 +131,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/ntp-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml
index e9028d14c..7e4d19078 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml
@@ -136,7 +136,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml
index 530f56dfc..0aeb9e696 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -24,21 +24,21 @@
           <defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9600649228560</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return[
 'JenkinsJob',
 'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
           <randomName>choice-parameter-9600651313765</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("JenkinsJob")) {
 return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -67,7 +67,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -79,13 +79,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
           <randomName>choice-parameter-9600653373369</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (artifact_source.equals("ArtifactRepo")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
@@ -94,7 +94,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -106,13 +106,13 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -120,7 +120,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -132,13 +132,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -147,7 +147,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -162,12 +162,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.model.StringParameterDefinition>
           <name>sunbird_auth_branch_or_tag</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbird auth repo.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>release-1.15_RC9</defaultValue>
+          <defaultValue>release-3.6.0</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -181,8 +181,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -191,7 +191,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>keycloak-3.2.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
index f34b4e974..0981b7800 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
@@ -153,12 +153,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/ntp-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.5.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml
index 89018080d..413dc7c22 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml
index 54d1fa46b..fb34338fb 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -39,7 +39,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -66,7 +66,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -89,7 +89,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -103,8 +103,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +113,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml
index a79a0679a..bde05ee65 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml
index 306f28c71..403aaa17b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml
index f123de45a..ba4d2985a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -39,7 +39,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -66,7 +66,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -102,7 +102,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -116,8 +116,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -126,7 +126,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggingFileBeatsVM/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/LoggingFileBeatsVM/config.xml
similarity index 95%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggingFileBeatsVM/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/LoggingFileBeatsVM/config.xml
index 6d70dacf0..044745f2f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggingFileBeatsVM/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/LoggingFileBeatsVM/config.xml
@@ -29,7 +29,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/Kubernetes/LoggingFileBeatsVM</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -56,7 +56,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/Kubernetes/LoggingFileBeatsVM</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/Kubernetes/LoggingFileBeatsVM</projectFullName>
           <choiceType>PT_MULTI_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
@@ -124,7 +124,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>LoggingFileBeatsVM</projectName>
-          <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+          <projectFullName>Deploy/dev/Kubernetes/LoggingFileBeatsVM</projectFullName>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
@@ -172,4 +172,4 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml
index 275efa820..e5f6fc441 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml
@@ -80,7 +80,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <hudson.model.StringParameterDefinition>
           <name>tag</name>
-          <description/>
+          <description>Please use "dashboards" as tag if you want to install/update the grafana dashboards.</description>
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
@@ -100,8 +100,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -110,7 +110,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.5.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml
index be00b7b2d..90cdf960a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml
@@ -110,7 +110,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>internal-lb-fix</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml
index 752aac166..55d1ee45d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NodebbUI/config.xml
similarity index 76%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NodebbUI/config.xml
index 20b153b78..e5438741b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NodebbUI/config.xml
@@ -3,20 +3,7 @@
   <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <hudson.plugins.copyartifact.CopyArtifactPermissionProperty plugin="copyartifact@1.43.1">
-      <projectNameList>
-        <string>ArtifactUpload/dev/Core/OfflineInstaller</string>
-      </projectNameList>
-    </hudson.plugins.copyartifact.CopyArtifactPermissionProperty>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
@@ -26,78 +13,14 @@
         <hudson.model.StringParameterDefinition>
           <name>absolute_job_path</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/OfflineInstaller</defaultValue>
+          <defaultValue>ArtifactUpload/dev/Core/NodebbUI</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
-          <name>private_branch</name>
-          <description/>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>offlineInstaller</projectName>
-          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
-          <name>branch_or_tag</name>
-          <description/>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="release-3.5.0" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
-
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>offlineInstaller</projectName>
-          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>offline_installer_type</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the type of installer you wanted to build&lt;/b&gt;&lt;/font&gt;</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>windows64bit</string>
-              <string>linux64bit</string>
-              <string>windows32bit</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
         <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-1754928650096303</randomName>
+          <randomName>choice-parameter-620062284617427</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
             <secureScript plugin="script-security@1.75">
@@ -112,8 +35,8 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>offlineInstaller</projectName>
-          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+          <projectName>NodebbUI</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/NodebbUI</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
@@ -123,7 +46,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
           <description/>
-          <randomName>choice-parameter-1754928651800681</randomName>
+          <randomName>choice-parameter-620062286335119</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
             <secureScript plugin="script-security@1.75">
@@ -141,8 +64,8 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>offlineInstaller</projectName>
-          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+          <projectName>NodebbUI</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/NodebbUI</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -151,7 +74,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
           <description/>
-          <randomName>choice-parameter-1754928653885653</randomName>
+          <randomName>choice-parameter-620062288387509</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
             <secureScript plugin="script-security@1.75">
@@ -168,13 +91,65 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>offlineInstaller</projectName>
-          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+          <projectName>NodebbUI</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/NodebbUI</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>private_branch</name>
+          <description/>
+          <randomName>choice-parameter-2544395024638227</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>NodebbUI</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/NodebbUI</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+          <name>branch_or_tag</name>
+          <description/>
+          <randomName>choice-parameter-2620434998790477</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.75">
+              <script>if (override_public_branch.equals("true")) {
+return """&lt;input name="value" value="${public_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+}
+else
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.75">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>NodebbUI</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/NodebbUI</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters/>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
@@ -191,7 +166,7 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
           <spec/>
-          <upstreamProjects>ArtifactUpload/dev/Core/OfflineInstaller</upstreamProjects>
+          <upstreamProjects>/ArtifactUpload/dev/Core/NodebbUI</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -222,14 +197,14 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <shallow>true</shallow>
           <noTags>false</noTags>
           <reference/>
-          <depth>1</depth>
+          <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/deploy/NodebbUI/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml
index f1aec9208..5045f55c7 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml
index a6ec25b00..31b2af4eb 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -39,7 +39,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -66,7 +66,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -89,7 +89,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -103,8 +103,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +113,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml
index 10044249b..480e616ed 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -18,13 +18,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-186788940114941</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -32,7 +32,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -44,13 +44,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-186788943531283</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -59,7 +59,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -73,7 +73,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -84,8 +84,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
index a28bc0763..ca962611c 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>true</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,17 +126,17 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/ntp-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml
index a79315647..c3a78cb09 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -34,65 +35,65 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
+          <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Print</projectName>
           <projectFullName>Deploy/dev/Kubernetes/Print</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Print</projectName>
           <projectFullName>Deploy/dev/Kubernetes/Print</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <hudson.model.ChoiceParameterDefinition>
           <name>role_name</name>
-          <description/>
+          <description></description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
               <string>sunbird-deploy</string>
@@ -101,20 +102,19 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
+          <spec></spec>
           <upstreamProjects>ArtifactUpload/dev/Core/Print</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -145,7 +145,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml
index 47bf1e8ee..afea80b25 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml
@@ -136,7 +136,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Router/config.xml
similarity index 89%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Router/config.xml
index 6b5fd45cb..dc8c2dee9 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Router/config.xml
@@ -28,7 +28,7 @@
         <hudson.model.StringParameterDefinition>
           <name>absolute_job_path</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>Deploy/dev/Core/PlayerCDN</defaultValue>
+          <defaultValue>ArtifactUpload/dev/Core/Router</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
@@ -56,8 +56,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Player</projectName>
-          <projectFullName>Deploy/dev/Core/Player</projectFullName>
+          <projectName>Router</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Router</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -83,13 +83,22 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Player</projectName>
-          <projectFullName>Deploy/dev/Core/Player</projectFullName>
+          <projectName>Router</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/Router</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>chatbot</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
@@ -106,7 +115,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
           <spec/>
-          <upstreamProjects>Deploy/dev/Core/PlayerCDN</upstreamProjects>
+          <upstreamProjects>ArtifactUpload/dev/Core/Router</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -122,7 +131,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-bot.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -137,12 +146,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <shallow>true</shallow>
           <noTags>false</noTags>
           <reference/>
-          <depth>1</depth>
+          <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/deploy/player/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/chatbot.Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml
index 0ef53825a..5048019f8 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml
@@ -136,7 +136,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml
index ef2a23242..9dc6d6e0e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml
index ef7c4a9a1..6f6420cf1 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -34,65 +35,65 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
+          <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Telemetry</projectName>
           <projectFullName>Deploy/dev/Kubernetes/Telemetry</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Telemetry</projectName>
           <projectFullName>Deploy/dev/Kubernetes/Telemetry</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
         <hudson.model.ChoiceParameterDefinition>
           <name>role_name</name>
-          <description/>
+          <description></description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
               <string>sunbird-deploy</string>
@@ -101,20 +102,19 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
+          <spec></spec>
           <upstreamProjects>ArtifactUpload/dev/Core/Telemetry</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -126,8 +126,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -145,7 +145,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadDesktopFaq/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadChatbotConfig/config.xml
similarity index 77%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadDesktopFaq/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadChatbotConfig/config.xml
index 69ec6f249..d471f3a54 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadDesktopFaq/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadChatbotConfig/config.xml
@@ -1,14 +1,21 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
-  <actions/>
+  <actions>
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+      <jobPropertyDescriptors>
+        <string>hudson.model.ParametersDefinitionProperty</string>
+        <string>com.sonyericsson.rebuild.RebuildSettings</string>
+      </jobPropertyDescriptors>
+    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+  </actions>
   <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -37,8 +44,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>UploadDesktopFaq</projectName>
-          <projectFullName>Deploy/dev/Core/UploadDesktopFaq</projectFullName>
+          <projectName>UploadChatbotConfig</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/UploadChatbotConfig</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -64,46 +71,55 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>UploadDesktopFaq</projectName>
-          <projectFullName>Deploy/dev/Core/UploadDesktopFaq</projectFullName>
+          <projectName>UploadChatbotConfig</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/UploadChatbotConfig</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.StringParameterDefinition>
+          <name>bot_repo_branch</name>
+          <description/>
+          <defaultValue>master</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
-          <name>desktop_container</name>
+          <name>container_name</name>
           <description/>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
-              <string>public</string>
+              <string>chatbot</string>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>source_path</name>
+          <description/>
+          <defaultValue>sunbird-bot/router/config</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
           <name>destination_path</name>
           <description/>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>desktopFAQ/faq-en.json</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
+          <defaultValue>chatbot/router/config</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>tag</name>
           <description/>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
-              <string>upload-desktop-faq</string>
+              <string>upload-chatbot-config</string>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
-          <name>src_file_path</name>
+          <name>bot_repo</name>
           <description/>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
-              <string>utils/DesktopFAQ/faq-en.json</string>
+              <string>https://github.com/project-sunbird/sunbird-bot.git</string>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
@@ -123,8 +139,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -148,9 +164,9 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/deploy/desktop-faq/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/upload/chatbot/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml
index b2dbba035..411597a65 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -39,7 +39,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -66,7 +66,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -81,12 +81,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.model.StringParameterDefinition>
           <name>kp_branch_or_tag</name>
           <description>This is knowledge platform branch or tag</description>
-          <defaultValue>release-3.4.0</defaultValue>
+          <defaultValue>release-3.7.0</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -100,8 +100,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -110,7 +110,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml
index afb0969da..3ab56ba4d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -31,185 +32,184 @@
           <defaultValue>ArtifactUpload/dev/Core/Yarn</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9061667106947</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.66">
               <script>return[
-'JenkinsJob',
-'ArtifactRepo'
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>build_number</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-9061670571657</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("JenkinsJob")) {
-return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
 { 
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>artifact_version</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-9061673103864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("ArtifactRepo")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 } 
 else {
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters>artifact_source</referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
           <name>job_names_to_deploy</name>
           <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the samza app names to deploy and this will kill the selected samza app and deploy them. Multi selection is available.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-8026182213525059</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>return ['lms.user-account-merger_1',
-'lms.sso-account-updater_1',
-'lms.indexer_1',
-'lms.notification-job_1']</script>
+            <secureScript plugin="script-security@1.66">
+              <script>return [&apos;lms.user-account-merger_1&apos;,
+&apos;lms.sso-account-updater_1&apos;,
+&apos;lms.indexer_1&apos;,
+&apos;lms.notification-job_1&apos;]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+          <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>PT_MULTI_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -227,7 +227,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml
index 6af233e9f..7d9c7d81b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -102,7 +102,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -116,8 +116,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml
index e24b07952..22d9def39 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -102,7 +102,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -116,8 +116,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -126,7 +126,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.4.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/redis/config.xml
similarity index 78%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/redis/config.xml
index 821fb2fbf..073dd5a2b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/redis/config.xml
@@ -25,18 +25,6 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Content</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
           <name>private_branch</name>
           <description/>
@@ -56,8 +44,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Content</projectName>
-          <projectFullName>Deploy/dev/Core/Content</projectFullName>
+          <projectName>redis</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/redis</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -83,13 +71,22 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Content</projectName>
-          <projectFullName>Deploy/dev/Core/Content</projectFullName>
+          <projectName>redis</projectName>
+          <projectFullName>Deploy/dev/Kubernetes/redis</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>role_name</name>
+          <description/>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>chatbot</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
@@ -103,18 +100,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
-          <upstreamProjects>ArtifactUpload/dev/Core/Content</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
+      <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -122,12 +108,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-bot.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>sc-1928</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -137,12 +123,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <shallow>true</shallow>
           <noTags>false</noTags>
           <reference/>
-          <depth>1</depth>
+          <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/deploy/content/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/redis.Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
index 0f30f927e..5a32c011b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -187,7 +187,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>editor-chnages</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
index be250dc94..1c65e94d2 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -187,7 +187,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>editor-chnages</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
index 04b82ffeb..999dde5c3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -16,51 +17,51 @@
           <defaultValue>ArtifactUpload/dev/Plugins/ContentPlayer</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-620062284617427</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.66">
               <script>return[
-'JenkinsJob',
-'ArtifactRepo'
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlayer</projectName>
           <projectFullName>Deploy/dev/Plugins/ContentPlayer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>build_number</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-620062286335119</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("JenkinsJob")) {
-return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
 { 
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -71,23 +72,23 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>artifact_version</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-620062288387509</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("ArtifactRepo")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 } 
 else {
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -98,74 +99,73 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlayer</projectName>
           <projectFullName>Deploy/dev/Plugins/ContentPlayer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="${public_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlayer</projectName>
           <projectFullName>Deploy/dev/Plugins/ContentPlayer</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
+          <spec></spec>
           <upstreamProjects>ArtifactUpload/dev/Plugins/ContentPlayer</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -177,8 +177,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -196,7 +196,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
index d3dc97dda..885232b5b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -16,51 +17,51 @@
           <defaultValue>ArtifactUpload/dev/Plugins/ContentPlugins</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-620062284617427</randomName>
-          <visibleItemCount>1</visibleItemCount>
+          <visibleItemCount>2</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.66">
               <script>return[
-'JenkinsJob',
-'ArtifactRepo'
+&apos;JenkinsJob&apos;,
+&apos;ArtifactRepo&apos;
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlugins</projectName>
           <projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>build_number</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-620062286335119</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("JenkinsJob")) {
-return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
 { 
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -71,23 +72,23 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>artifact_version</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-620062288387509</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (artifact_source.equals("ArtifactRepo")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 } 
 else {
-return "&lt;b&gt;Not Applicable&lt;/b&gt;"
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script/>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -98,74 +99,74 @@ return "&lt;b&gt;Not Applicable&lt;/b&gt;"
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlugins</projectName>
           <projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="${public_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>ContentPlugins</projectName>
           <projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
+      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
+          <spec></spec>
           <upstreamProjects>ArtifactUpload/dev/Plugins/ContentPlugins</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
@@ -177,8 +178,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -196,7 +197,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
index 102495eaa..53d4faf5e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -187,7 +187,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>editor-chnages</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml
deleted file mode 100644
index 73b41059d..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Plugins/ContentPlugins</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-620062284617427</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
-]</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>org_sunbird_questionunit_quml</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>PT_SINGLE_SELECT</choiceType>
-          <filterable>false</filterable>
-          <filterLength>1</filterLength>
-        </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>build_number</name>
-          <description></description>
-          <randomName>choice-parameter-620062286335119</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-{ 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>org_sunbird_questionunit_quml</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>artifact_version</name>
-          <description></description>
-          <randomName>choice-parameter-620062288387509</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-} 
-else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
-}</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script></script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>org_sunbird_questionunit_quml</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters>artifact_source</referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>org_sunbird_questionunit_quml</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>org_sunbird_questionunit_quml</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>plugin_name</name>
-          <description></description>
-          <defaultValue>org.sunbird.questionunit.quml-1.0</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/org_sunbird_questionunit_quml/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/config.xml b/deploy/jenkins/jobs/OpsAdministration/config.xml
index 92618cba9..68477b8ac 100644
--- a/deploy/jenkins/jobs/OpsAdministration/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.16"/>
-    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+      <registry plugin="docker-commons@1.13"/>
+    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml
index fa769962d..6ac2482d1 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml
index af8153a6b..5e5da31ac 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml
@@ -103,7 +103,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/MasterAlt/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml
index 85c852a17..2bbc1edd9 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml
@@ -101,7 +101,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.9.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
index 30e2a224b..7bb601d80 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
@@ -114,12 +114,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/rjshrjndrn/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>useradd</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
index 5e891cba0..734cc8672 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
@@ -94,7 +94,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml
index c4b347736..1c18d217f 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml
@@ -98,7 +98,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml
index 3d52d256c..14a8aa218 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml
index 74888f8ff..9a31f8ac4 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml
@@ -107,7 +107,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml
index 11c154f9a..ce628782d 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml
index f9a24a2bc..c3f683d6f 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml
@@ -90,7 +90,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml
index 1d8cb3e0e..1b235d217 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml
index 768fce6ca..3dcd500e0 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml
@@ -99,7 +99,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backup</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml
index 0f5f261ef..0aa7ef1a3 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.3.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml
deleted file mode 100644
index ef4f2bf6d..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-189723213053334</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>SwarmBootstrap</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-189723215007628</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>SwarmBootstrap</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/bootstrap-swarm/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml
index ddae73cc3..9919684db 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml
@@ -118,7 +118,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml
index fa5bdcbb2..657062c09 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml
@@ -109,7 +109,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml
index 995714507..0930cf0cc 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml
@@ -98,7 +98,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml
index 5ea4ae60f..892d24778 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml
@@ -112,7 +112,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml
index c3d014087..a5bd7e8d0 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml
@@ -111,7 +111,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml
index 49635f78e..fb37f4fe0 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml
@@ -103,12 +103,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/MasterAlt/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.9.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml
index 9a0942df5..615c105c4 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml
@@ -70,7 +70,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.9.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml
index 713e2f38d..8f1045475 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml
@@ -110,12 +110,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-3.2.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml
index edfc1ee0d..416d567b2 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml
@@ -90,7 +90,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml
index 1369badc4..faeeb5e2e 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml
@@ -90,7 +90,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml
index 7d3c56036..a0ca8257e 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml
@@ -92,12 +92,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>redis-multiprocess</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml
index 002f8f1f8..dc74a32bc 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml
@@ -150,7 +150,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.10.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml
index 6bead98a4..5fc3897ef 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml
@@ -113,7 +113,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml
index 293f2e6b9..e77ed5775 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml
@@ -123,7 +123,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
index 20c333f60..0b79cce07 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
@@ -61,7 +61,7 @@
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>refs/tags/tag-for-backups</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml
deleted file mode 100644
index 08c7fb9e7..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><project>
-  <actions/>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.FileParameterDefinition>
-          <name>~jenkins</name>
-          <description/>
-        </hudson.model.FileParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <canRoam>true</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers/>
-  <concurrentBuild>false</concurrentBuild>
-  <builders/>
-  <publishers/>
-  <buildWrappers/>
-</project>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml
index 4de167aaf..abc7a3a09 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml
@@ -66,12 +66,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>redis-multiprocess</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml
index a18842935..e7d8019a5 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml
@@ -108,12 +108,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/badaltechiepi/sunbird-learning-platform.git</url>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>patch-2</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml
index 6f995b76a..e05135504 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml
@@ -96,12 +96,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/MasterAlt/sunbird-learning-platform.git</url>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>es-provision</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
index 2b968ad93..1439c33ee 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
@@ -103,7 +103,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/MasterAlt/sunbird-learning-platform.git</url>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
index d5825945e..febb94b07 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
@@ -23,7 +23,7 @@
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/harshavardhanc/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml
index 63f498537..df9076d48 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml
@@ -101,7 +101,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.9.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
index 9de5c0d6c..4e3c21346 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
@@ -96,12 +96,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/MasterAlt/sunbird-learning-platform.git</url>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>release-2.9.0</name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Provision/config.xml b/deploy/jenkins/jobs/Provision/config.xml
index 92618cba9..68477b8ac 100644
--- a/deploy/jenkins/jobs/Provision/config.xml
+++ b/deploy/jenkins/jobs/Provision/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.16"/>
-    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+      <registry plugin="docker-commons@1.13"/>
+    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/config.xml
index ca27afff7..56424f5bf 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.5.0-rc1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.17"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
index 7670b1cf7..e399fb8fb 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions/>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -18,74 +19,73 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196486141556745</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Cassandra</projectName>
           <projectFullName>Provision/dev/Core/Cassandra</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196486144020383</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Cassandra</projectName>
           <projectFullName>Provision/dev/Core/Cassandra</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -103,7 +103,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml
index 9e219ff21..20e841795 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
   <description/>
   <keepDependencies>false</keepDependencies>
@@ -18,13 +18,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-186487879604743</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="db_restore" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -32,25 +32,25 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>LogEsUpgrade6xx</projectName>
-          <projectFullName>Provision/dev/Core/LogEsUpgrade6xx</projectFullName>
+          <projectName>LogES</projectName>
+          <projectFullName>Provision/dev/Core/LogES</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-186487885338467</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -59,13 +59,13 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>LogEsUpgrade6xx</projectName>
-          <projectFullName>Provision/dev/Core/LogEsUpgrade6xx</projectFullName>
+          <projectName>LogES</projectName>
+          <projectFullName>Provision/dev/Core/LogES</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -73,7 +73,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -84,8 +84,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml
index 51b9561dc..a360699f2 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml
@@ -38,7 +38,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>MongodbCluster</projectName>
-          <projectFullName>Provision/staging/Core/MongodbCluster</projectFullName>
+          <projectFullName>Provision/dev/Core/MongodbCluster</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -65,7 +65,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
             </secureFallbackScript>
           </script>
           <projectName>MongodbCluster</projectName>
-          <projectFullName>Provision/staging/Core/MongodbCluster</projectFullName>
+          <projectFullName>Provision/dev/Core/MongodbCluster</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -82,7 +82,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
       <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
+    
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
     <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
@@ -114,4 +114,4 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml
index 26c84258d..ae046ae24 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
   <actions/>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -12,80 +13,75 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196489635829894</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.57">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.57">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Postgres</projectName>
-          <projectFullName>Provision/dev/Core/Postgres</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196489639391445</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.57">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.57">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Postgres</projectName>
-          <projectFullName>Provision/dev/Core/Postgres</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -103,7 +99,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -114,4 +110,4 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml
index d8a68c1d3..94fd87fc6 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
   <actions/>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -12,80 +13,77 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196490490920280</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>PostgresDbUpdate</projectName>
-          <projectFullName>Provision/dev/Core/PostgresDbUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196490493760485</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>PostgresDbUpdate</projectName>
-          <projectFullName>Provision/dev/Core/PostgresDbUpdate</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -103,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml
index 258e0b0af..6aaa2e93e 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml
@@ -99,7 +99,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml
deleted file mode 100644
index e48455cea..000000000
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-196487835595646</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>user-keycloak</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-196487838166797</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>user-keycloak</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/provision/keycloak/Jenkinsfile.user</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
index e37a1573e..fc5dc310d 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -18,80 +19,75 @@
         <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196493724128621</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.57">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.57">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsSecor</projectName>
-          <projectFullName>Provision/dev/DataPipeline/AnalyticsSecor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196493728691761</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.57">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.57">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>AnalyticsSecor</projectName>
-          <projectFullName>Provision/dev/DataPipeline/AnalyticsSecor</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -109,7 +105,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -120,4 +116,4 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml
index 1d7be9b90..d596ee135 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-196494527011530</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -39,7 +39,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -51,13 +51,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-196494532752488</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -66,7 +66,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -80,7 +80,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -91,8 +91,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
index 2f1626e38..d8bc26014 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,23 +25,24 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>service</name>
           <description>&lt;font color=green size=2&gt;&lt;b&gt;Choose the services to deploy. Multi-selection is available.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-160652271515504</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>return['java',
-'graphite',
+'zookeeper',
 'coordinator',
 'overlord',
 'broker',
 'historical',
-'mm']</script>
+'mm',
+'router']</script>
               <sandbox>true</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script/>
               <sandbox>true</sandbox>
             </secureFallbackScript>
@@ -54,9 +55,22 @@
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>remote</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt;
+Raw Cluster: [raw]
+Rollup Cluster:  [rollup]
+&lt;/b&gt;&lt;/font&gt; </description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>raw</string>
+              <string>rollup</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -67,8 +81,8 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
index 0f08793d1..221b6f376 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -25,74 +26,73 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196500122471866</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>true</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
           <projectFullName>Provision/dev/DataPipeline/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196500128714203</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>true</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>true</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Yarn</projectName>
           <projectFullName>Provision/dev/DataPipeline/Yarn</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -110,7 +110,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml
index 2b9c16fda..5f925ba92 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -24,13 +24,13 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-196498570819230</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -38,7 +38,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -50,13 +50,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-196498577913500</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.75">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-data-pipeline"&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -65,7 +65,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.75">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -79,7 +79,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -90,8 +90,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
index c311af545..6897453dd 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -25,77 +26,76 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196502397927441</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CompositeSearch</projectName>
           <projectFullName>Provision/dev/KnowledgePlatform/CompositeSearch</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196502408664232</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.66">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>CompositeSearch</projectName>
           <projectFullName>Provision/dev/KnowledgePlatform/CompositeSearch</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +113,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
index c342840a3..332ddd651 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -19,83 +20,80 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196503227911555</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Kafka</projectName>
-          <projectFullName>Provision/dev/KnowledgePlatform/Kafka</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196503234123956</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Kafka</projectName>
-          <projectFullName>Provision/dev/KnowledgePlatform/Kafka</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +111,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
index 47979810f..b183632da 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -19,83 +20,80 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196504004472286</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.57">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.57">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Learning</projectName>
-          <projectFullName>Provision/dev/KnowledgePlatform/Learning</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196504007625526</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.57">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.57">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Learning</projectName>
-          <projectFullName>Provision/dev/KnowledgePlatform/Learning</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +111,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -124,4 +122,4 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index 2d490d85a..53f8e6264 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -19,83 +20,80 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196504831541165</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
-          <projectFullName>Provision/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196504838020082</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.58">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.58">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Neo4j</projectName>
-          <projectFullName>Provision/dev/KnowledgePlatform/Neo4j</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +111,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
index 545feab17..103cb6d42 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
   <actions>
     <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
@@ -7,7 +8,7 @@
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description/>
+  <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -19,83 +20,78 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196485017539792</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
+            <secureScript plugin="script-security@1.57">
+              <script>if (override_private_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.57">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Zookeeper</projectName>
-          <projectFullName>Provision/dev/KnowledgePlatform/Zookeeper</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
-          <description/>
+          <description></description>
           <randomName>choice-parameter-196485022834542</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-learning-platform"&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
+            <secureScript plugin="script-security@1.57">
+              <script>if (override_public_branch.equals(&quot;true&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
+            <secureFallbackScript plugin="script-security@1.57">
+              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>Zookeeper</projectName>
-          <projectFullName>Provision/dev/KnowledgePlatform/Zookeeper</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters/>
+          <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
+      <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +109,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference/>
+          <reference></reference>
           <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -124,4 +120,4 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>

From ddc4afd6102a36011b9ad958e39396ec277212f3 Mon Sep 17 00:00:00 2001
From: keshavprasadms <keshavprasadms@gmail.com>
Date: Fri, 12 Feb 2021 10:06:41 +0530
Subject: [PATCH 166/184] fix: update jobs, jenkins version

---
 deploy/jenkins/jenkins-server-setup.sh        |  2 +-
 .../Build/jobs/Core/jobs/Player/config.xml    | 20 +------
 .../Core/jobs/PlayerCustomStage/config.xml    | 60 -------------------
 3 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml

diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh
index cec51c4fd..e888fb818 100755
--- a/deploy/jenkins/jenkins-server-setup.sh
+++ b/deploy/jenkins/jenkins-server-setup.sh
@@ -15,7 +15,7 @@ echo -e "\n\e[0;32m${bold}Installating Jenkins${normal}"
 wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | apt-key add -
 apt-add-repository "deb https://pkg.jenkins.io/debian-stable binary/"
 apt-get update
-apt-get install -y jenkins=2.263.1
+apt-get install -y jenkins=2.263.4
 
 echo -e "\n\e[0;32m${bold}Installating PIP${normal}"
 apt-get install -y python-pip
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
index 36db52e11..2bdb6d314 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
@@ -37,24 +37,6 @@
           <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
           <trim>true</trim>
         </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>sunbird_content_editor_artifact_url</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Blob URL for content editor zip file&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/content-editor-iframe-3.0.0.zip</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>sunbird_collection_editor_artifact_url</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Blob URL for collection editor zip file&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/collection-editor-iframe-3.0.0.zip</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>sunbird_generic_editor_artifact_url</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Blob URL for generic editor zip file&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/generic-editor-iframe-2.9.0.zip</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>buildDockerImage</name>
           <description/>
@@ -121,4 +103,4 @@
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml
deleted file mode 100644
index 133012369..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
-  <actions/>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.80">
-    <script>node(){
-ansiColor('xterm') {
-  String ANSI_GREEN = "\u001B[32m"
-  String ANSI_NORMAL = "\u001B[0m"
-  String ANSI_BOLD = "\u001B[1m"
-  String ANSI_RED = "\u001B[31m"
-  String ANSI_YELLOW = "\u001B[33m"
-  buildNumber = params.build_number
-  try {
-    copyArtifacts projectName: params.absolute_job_path, fingerprintArtifacts: true, flatten: true, selector: specific(buildNumber)
-  }
-  catch (err) {
-    println ANSI_YELLOW + ANSI_BOLD + "Ok that failed!. Lets try an alertnative.." + ANSI_NORMAL
-    copyArtifacts projectName: params.absolute_job_path, flatten: true, selector: upstream()
-  }
-  stage('ArchiveArtifacts') {
-    archiveArtifacts "metadata.json"
-    currentWs = sh(returnStdout: true, script: 'pwd').trim()
-    image_tag = sh(returnStdout: true, script: 'jq -r .image_tag metadata.json').trim()
-    agent = sh(returnStdout: true, script: 'jq -r .node_name metadata.json').trim()
-    image_name = sh(returnStdout: true, script: 'jq -r .image_name metadata.json').trim()
-    commit_hash = sh(returnStdout: true, script: 'jq -r .commit_hash metadata.json').trim()
-    values = [:]
-    values.put('image_name', image_name)
-    values.put('image_tag', image_tag)
-    values.put('commit_hash', commit_hash)
-    cdn_file_exists = new File("$currentWs/index_cdn.ejs")
-    if (cdn_file_exists.exists()) {
-        archiveArtifacts "index_cdn.ejs, cdn_assets.zip"
-    }
-    currentBuild.description = "${values.image_tag}"
-  }
-}
-}</script>
-    <sandbox>true</sandbox>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file

From 132c81b869640cdc03cf8499cfe88cca8f4f9b59 Mon Sep 17 00:00:00 2001
From: keshavprasadms <keshavprasadms@gmail.com>
Date: Fri, 12 Feb 2021 10:21:03 +0530
Subject: [PATCH 167/184] fix: updated plugins and m2

---
 deploy/jenkins/jenkins-plugins-setup.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/deploy/jenkins/jenkins-plugins-setup.sh b/deploy/jenkins/jenkins-plugins-setup.sh
index b6956c7df..3ec26f3be 100755
--- a/deploy/jenkins/jenkins-plugins-setup.sh
+++ b/deploy/jenkins/jenkins-plugins-setup.sh
@@ -4,23 +4,28 @@ normal=$(tput sgr0)
 
 if [[ ! -d /var/lib/jenkins/.m2 ]]; then
 echo -e "\n\e[0;32m${bold}Downloading and copying m2 directory to Jenkins ${normal}"
-wget https://sunbirdpublic.blob.core.windows.net/installation/m2_new.zip
-unzip m2_new.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/m2.tar
+tar -xf m2.tar
 mv .m2 /var/lib/jenkins
 chown -R jenkins:jenkins /var/lib/jenkins/.m2
+else
+wget https://sunbirdpublic.blob.core.windows.net/installation/m2.tar    
+tar -xf m2.tar  
+cp -rf .m2/* /var/lib/jenkins/.m2/
+chown -R jenkins:jenkins /var/lib/jenkins/.m2
 fi
 
 echo -e "\n\e[0;32m${bold}Downloading and copying jenkins plugin directory to Jenkins ${normal}"
 if [[ ! -d /var/lib/jenkins/plugins ]]; then
-wget https://sunbirdpublic.blob.core.windows.net/installation/jenkins-plugins-new.zip
-unzip jenkins-plugins-new.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/plugins.tar
+tar -xf plugins.tar
 mv plugins /var/lib/jenkins/
 chown -R jenkins:jenkins /var/lib/jenkins/plugins
 else
-wget https://sunbirdpublic.blob.core.windows.net/installation/jenkins-plugins-new.zip
-unzip jenkins-plugins-new.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/plugins.tar
+tar -xf plugins.tar
 cp -rf plugins/* /var/lib/jenkins/plugins/
 chown -R jenkins:jenkins /var/lib/jenkins/plugins
 fi
 
-echo -e "\n\e[0;32m${bold}Go to manage jenkins -> Plugin manager -> Update center -> Check status of installation${normal}"
+echo -e "\n\e[0;32m${bold}Go to manage jenkins -> Plugin manager -> Update center -> Check status of installation OR Check the list of installed plugins${normal}"

From 671495453050e04aa8ffda4bcc7ad040c7e32fc3 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Fri, 12 Feb 2021 04:57:50 +0000
Subject: [PATCH 168/184] Adding default value for discussion_upstream_url
 (#2228)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 kubernetes/ansible/roles/helm-deploy/defaults/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index a1b88f665..8f248c5ec 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -35,6 +35,7 @@ kibana_service: "{{swarm_dashboard}}:5601"
 
 upstream_url: "ekstep-public-{{ekstep_s3_env}}.s3-ap-south-1.amazonaws.com"
 plugin_upstream_url: "ekstep-public-{{ekstep_s3_env}}.s3-ap-south-1.amazonaws.com"
+discussion_upstream_url: "{{ sunbird_public_storage_account_name  }}.blob.core.windows.net"
 sunbird_offline_azure_storage_account_url: "{{ sunbird_public_storage_account_name }}.blob.core.windows.net/{{ offline_installer_container_name }}"
 
 proxy_cache_path:

From ea450b8ebdef6c5d6f8fe8815bc1d8622334d7fe Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Fri, 12 Feb 2021 06:02:07 +0000
Subject: [PATCH 169/184] Adding admin username override for nodebb (#2229)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 ansible/roles/stack-sunbird/templates/sunbird_nodebb.env | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env b/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
index b58add336..9e0b890f9 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_nodebb.env
@@ -9,3 +9,4 @@ mongo__database=nodebb
 # 'node app --setup' multiple times
 # Default username is admin
 admin__password={{ nodebb_admin_password }}
+admin__username={{ nodebb_admin_username | d('admin') }}

From 38474ebe0918364ae148051d29434cff44d50fd4 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <keshavprasadms@gmail.com>
Date: Mon, 15 Feb 2021 11:33:17 +0530
Subject: [PATCH 170/184] fix: removed unnecessary varaibles (#2234)

---
 private_repo/ansible/inventory/dev/Core/common.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/private_repo/ansible/inventory/dev/Core/common.yml b/private_repo/ansible/inventory/dev/Core/common.yml
index d2ed77e87..80e308ec4 100644
--- a/private_repo/ansible/inventory/dev/Core/common.yml
+++ b/private_repo/ansible/inventory/dev/Core/common.yml
@@ -70,12 +70,6 @@ postgres:
 sunbird_google_captcha_site_key: 
 google_captcha_private_key: 
 
-# Admin util keys
-adminutil__access_keyprefix: "accessv1_key"
-adminutil__access_keystart: 1
-adminutil__access_keycount: 10
-
-
 ######################### Optional ###################
 ## Mail config
 mail_server_host:

From 572eddd355a5a8a53548269704cf509d3b4af713 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Tue, 16 Feb 2021 04:59:42 +0000
Subject: [PATCH 171/184] Increasing pod disruption budget for blackbox
 exporter. (#2241) (#2242)

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../helm_charts/monitoring/blackbox-exporter/values.yaml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubernetes/helm_charts/monitoring/blackbox-exporter/values.yaml b/kubernetes/helm_charts/monitoring/blackbox-exporter/values.yaml
index 6ff39c865..67ca6e36c 100755
--- a/kubernetes/helm_charts/monitoring/blackbox-exporter/values.yaml
+++ b/kubernetes/helm_charts/monitoring/blackbox-exporter/values.yaml
@@ -1,7 +1,7 @@
 restartPolicy: Always
 
 podDisruptionBudget:
-  maxUnavailable: 0
+  maxUnavailable: 1
 
 strategy:
   rollingUpdate:
@@ -106,7 +106,7 @@ serviceMonitor:
   ## If true, a ServiceMonitor CRD is created for a prometheus operator
   ## https://github.com/coreos/prometheus-operator
   ##
-  enabled: false 
+  enabled: false
   labels: { release: sunbird-monitoring }
   interval: 30s
   scrapeTimeout: 30s

From e01a510461065a2294a3dc0663b5c916d07207b0 Mon Sep 17 00:00:00 2001
From: keshavprasadms <keshavprasadms@gmail.com>
Date: Tue, 16 Feb 2021 16:40:03 +0530
Subject: [PATCH 172/184] fix: updated jenkins jobs for 3.6 and 3.7

---
 deploy/jenkins/jenkins-plugins-setup.sh       |   8 +-
 .../jobs/dev/jobs/Core/jobs/Badger/config.xml | 108 ------------
 .../jobs/dev/jobs/Core/jobs/Config/config.xml | 108 ------------
 .../dev/jobs/Core/jobs/UserOrg/config.xml     | 108 ------------
 .../Build/jobs/Core/jobs/Badger/config.xml    |  75 ---------
 .../jobs/Build/jobs/Core/jobs/Bot/config.xml  |  12 +-
 .../jobs/Core/jobs/CloudStorageSDK/config.xml |  84 ---------
 .../Build/jobs/Core/jobs/Config/config.xml    |  85 ----------
 .../Build/jobs/Core/jobs/Content/config.xml   |   7 +-
 .../jobs/DiscussionsMiddleware/config.xml     |   7 +-
 .../Build/jobs/Core/jobs/Nodebb/config.xml    |  14 +-
 .../Core/jobs/OfflineInstaller/config.xml     |  75 ---------
 .../PlatformCoursesFunctionalTest/config.xml  |  83 ---------
 .../Build/jobs/Core/jobs/Player/config.xml    |   5 +-
 .../Build/jobs/Core/jobs/Router/config.xml    |  12 +-
 .../Build/jobs/Core/jobs/UserOrg/config.xml   |  84 ---------
 .../Core/jobs/{Oauth => Bootstrap}/config.xml |  55 +++---
 .../jobs/CF-QUML_Migration_Script/config.xml  |  94 -----------
 .../jobs/DiscussionsMiddleware/config.xml     | 150 -----------------
 .../dev/jobs/Core/jobs/UserOrg/config.xml     | 148 ----------------
 .../Core/jobs/offlineInstaller/config.xml     | 138 ---------------
 .../Core/jobs/offlinewindowstest32/config.xml | 135 ---------------
 .../Core/jobs/offlinewindowstest64/config.xml | 135 ---------------
 .../config.xml                                |   0
 .../config.xml                                |   0
 .../DataPipeline/jobs/MLWorkbench/config.xml  |  97 -----------
 .../DataPipeline/jobs/Monitoring/config.xml   | 139 ---------------
 .../jobs/Monitoring}/config.xml               |  10 +-
 .../jobs/Search}/config.xml                   | 108 ++++++++----
 .../jobs/Kubernetes/jobs/Badger/config.xml    | 156 -----------------
 .../jobs/BootstrapMongodb/config.xml          |   0
 .../Kubernetes/jobs/DiscussionsMW/config.xml  |  14 +-
 .../jobs/FuntionalTestCases/config.xml        |  69 --------
 .../jobs/Kubernetes/jobs/Groups/config.xml    |  24 +--
 .../jobs/KafkaSetup/config.xml                |   0
 .../jobs/KeycloakMigration/config.xml         |  80 ++++-----
 .../jobs/KeycloakRealm/config.xml             |   0
 .../jobs/Kubernetes/jobs/Player/config.xml    |  14 +-
 .../jobs/Kubernetes/jobs/UserOrg/config.xml   | 159 ------------------
 .../dev/jobs/Kubernetes/jobs/redis/config.xml | 136 ---------------
 .../jobs/dev/jobs/Core/jobs/Health/config.xml |  43 -----
 .../dev/jobs/Core/jobs/KeyRotation/config.xml | 145 ----------------
 .../jobs/Core/jobs/KongMigration/config.xml   | 137 ---------------
 .../jobs/DataPipeline/jobs/Health/config.xml  |  43 -----
 .../config.xml                                |   0
 .../KnowledgePlatform/jobs/Health/config.xml  |  43 -----
 .../jobs/Core/jobs/keycloak-test/config.xml   | 114 -------------
 .../config.xml                                |   0
 48 files changed, 212 insertions(+), 3049 deletions(-)
 delete mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
 delete mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml
 delete mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
 delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/{Oauth => Bootstrap}/config.xml (76%)
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/DiscussionsMiddleware/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/{Druid_ingestion_health_check => DruidIngestionHealthCheck}/config.xml (100%)
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/{Druid_segment_health_check => DruidSegmentHealthCheck}/config.xml (100%)
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{DataPipeline/jobs/InfraMonitoring => KnowledgePlatform/jobs/Monitoring}/config.xml (94%)
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{DataPipeline/jobs/InternalKong => KnowledgePlatform/jobs/Search}/config.xml (64%)
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{Core => Kubernetes}/jobs/BootstrapMongodb/config.xml (100%)
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{Core => Kubernetes}/jobs/KafkaSetup/config.xml (100%)
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/{Core => Kubernetes}/jobs/KeycloakRealm/config.xml (100%)
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml
 delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/redis/config.xml
 delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml
 delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml
 delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml
 delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml
 rename deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/{redis-restore => RedisRestore}/config.xml (100%)
 delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
 delete mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml
 rename deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/{postgres-managed => PostgresManaged}/config.xml (100%)

diff --git a/deploy/jenkins/jenkins-plugins-setup.sh b/deploy/jenkins/jenkins-plugins-setup.sh
index 3ec26f3be..ad3851378 100755
--- a/deploy/jenkins/jenkins-plugins-setup.sh
+++ b/deploy/jenkins/jenkins-plugins-setup.sh
@@ -4,13 +4,13 @@ normal=$(tput sgr0)
 
 if [[ ! -d /var/lib/jenkins/.m2 ]]; then
 echo -e "\n\e[0;32m${bold}Downloading and copying m2 directory to Jenkins ${normal}"
-wget https://sunbirdpublic.blob.core.windows.net/installation/m2.tar
-tar -xf m2.tar
+wget https://sunbirdpublic.blob.core.windows.net/installation/m2-slim.tar
+tar -xf m2-slim.tar
 mv .m2 /var/lib/jenkins
 chown -R jenkins:jenkins /var/lib/jenkins/.m2
 else
-wget https://sunbirdpublic.blob.core.windows.net/installation/m2.tar    
-tar -xf m2.tar  
+wget https://sunbirdpublic.blob.core.windows.net/installation/m2-slim.tar
+tar -xf m2-slim.tar
 cp -rf .m2/* /var/lib/jenkins/.m2/
 chown -R jenkins:jenkins /var/lib/jenkins/.m2
 fi
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
deleted file mode 100644
index 6e2ea4303..000000000
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>Build/Core/Badger</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Push the docker image to container registry.
-&lt;/b&gt;&lt;/font&gt;</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>ArtifactRepo</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
-          <upstreamProjects>/Build/Core/Badger</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml
deleted file mode 100644
index 874765187..000000000
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>Build/Core/Config</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Push the docker image to container registry.
-&lt;/b&gt;&lt;/font&gt;</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>ArtifactRepo</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
-          <upstreamProjects>/Build/Core/Config</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
deleted file mode 100644
index 103b8d979..000000000
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>Build/Core/UserOrg</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>artifact_source</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
-ArtifactRepo - Push the docker image to container registry.
-&lt;/b&gt;&lt;/font&gt;</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>ArtifactRepo</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
-          <upstreamProjects>/Build/Core/UserOrg</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${public_repo_branch}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/upload/docker/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
deleted file mode 100644
index 0c80df220..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.75">
-    <script>node(){
-        build_tag=&quot;1.8.0-gold&quot;
-        name=&quot;badger&quot;
-        node=env.NODE_NAME
-        org=env.hub_org
-        
-     sh &quot;&quot;&quot;
-        docker pull sunbird/${name}:${build_tag}
-        docker tag sunbird/${name}:${build_tag} ${org}/${name}:${build_tag}
-        &quot;&quot;&quot;
-writeFile file: &apos;metadata.json&apos;, text: &apos;{ &quot;image_name&quot; : &quot;&apos; + name + &apos;&quot;, &quot;image_tag&quot; : &quot;&apos; + build_tag + &apos;&quot;, &quot;node_name&quot; : &quot;&apos; + node + &apos;&quot;}&apos;
-
-     archiveArtifacts artifacts: &apos;metadata.json&apos;, onlyIfSuccessful: true
-}</script>
-    <sandbox>true</sandbox>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
index 2f929ce38..cf45e95b6 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
@@ -38,19 +38,21 @@
           <trim>true</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>diksha_bot_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt; If the value is blank, master branch will be copied from diksha private repo. Specify github tag name to build from a tag &lt;br&gt;
+          <name>private_bot_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt; If the value is blank, master branch will be copied from bot private repo. Specify github tag name to build from a tag &lt;br&gt;
   keep empty to build from master &lt;br&gt;
+  &lt;br&gt;
+  keep empty if there is no bot private repo &lt;br&gt;
   &lt;/b&gt;&lt;/font&gt;</description>
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
-          <name>diksha_bot_repo</name>
-          <description/>
+          <name>private_bot_repo</name>
+          <description>&lt;font color=red size=3&gt;&lt;b&gt; keep empty if there is no bot private repo</description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
-              <string>https://github.com/DIKSHA-NCTE/Diksha-Bot.git</string>
+              <string/>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
deleted file mode 100644
index 8fc15e875..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-cloud-storage-sdk.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${github_release_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>true</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
deleted file mode 100644
index 842c70c41..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-config.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${github_release_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>true</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
index c0ac7d044..746733e67 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
@@ -39,7 +39,7 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -59,7 +59,7 @@
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,6 +71,9 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
     </scm>
     <scriptPath>build/content-service/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
index c78e9744d..9565409bf 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
@@ -39,7 +39,7 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -59,7 +59,7 @@
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -71,6 +71,9 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
index 9b2c31fc0..ca230f61b 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
@@ -38,7 +38,7 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -49,11 +49,16 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -65,6 +70,9 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
deleted file mode 100644
index 18e092b87..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>github_release_tag</name>
-          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
-&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
-&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
-&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
-&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
-&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
-          <trim>true</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${github_release_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-    </scm>
-    <scriptPath>Jenkinsfile.desktop</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
deleted file mode 100644
index b0634c473..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>github_release_tag</name>
-          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
-&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
-&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
-&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
-&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
-&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
-          <trim>true</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.TimerTrigger>
-          <spec>H 0 * * *</spec>
-        </hudson.triggers.TimerTrigger>
-        <hudson.triggers.SCMTrigger>
-          <spec>H 23 * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-functional-tests.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${github_release_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-    </scm>
-    <scriptPath>lms_service_api_test/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
index 2bdb6d314..6676f6440 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
@@ -97,10 +97,13 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
     </scm>
     <scriptPath>Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
index 9f98c0ca4..b4bd8f3a8 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
@@ -38,19 +38,21 @@
           <trim>true</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>diksha_bot_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt; If the value is blank, master branch will be copied from diksha private repo. Specify github tag name to build from a tag &lt;br&gt;
+          <name>private_bot_tag</name>
+          <description>&lt;font color=red size=2&gt;&lt;b&gt; If the value is blank, master branch will be copied from bot private repo. Specify github tag name to build from a tag &lt;br&gt;
   keep empty to build from master &lt;br&gt;
+  &lt;br&gt;
+  keep empty if there is no bot private repo &lt;br&gt;
   &lt;/b&gt;&lt;/font&gt;</description>
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
-          <name>diksha_bot_repo</name>
-          <description/>
+          <name>private_bot_repo</name>
+          <description>&lt;font color=red size=3&gt;&lt;b&gt; keep empty if there is no bot private repo</description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
-              <string>https://github.com/DIKSHA-NCTE/Diksha-Bot.git</string>
+              <string/>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
deleted file mode 100644
index 67a25d802..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.SCMTrigger>
-          <spec>H/15 * * * *</spec>
-          <ignorePostCommitHooks>false</ignorePostCommitHooks>
-        </hudson.triggers.SCMTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-user-service.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${github_release_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
similarity index 76%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
index 6bbe79142..76712ca41 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.33">
+<flow-definition plugin="workflow-job@2.31">
   <actions/>
   <description></description>
   <keepDependencies>false</keepDependencies>
@@ -12,20 +12,25 @@
         <artifactNumToKeep>2</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>hosts</name>
+          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Enter the host name to be bootstrapped.&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>all</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
           <description></description>
-          <randomName>choice-parameter-186759255678992</randomName>
+          <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
+            <secureScript plugin="script-security@1.53">
               <script>if (override_private_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
 }
@@ -33,12 +38,12 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
+            <secureFallbackScript plugin="script-security@1.53">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Oauth</projectName>
+          <projectName>Bootstrap</projectName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -47,10 +52,10 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
           <description></description>
-          <randomName>choice-parameter-186759262347032</randomName>
+          <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
+            <secureScript plugin="script-security@1.53">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
 return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
@@ -59,27 +64,17 @@ else
 return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
+            <secureFallbackScript plugin="script-security@1.53">
               <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>Oauth</projectName>
+          <projectName>Bootstrap</projectName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>tag</name>
-          <description></description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>stack-oauth</string>
-              <string>stack-kibana</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
@@ -92,8 +87,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -107,19 +102,11 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
       <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
+      <extensions/>
     </scm>
-    <scriptPath>pipelines/deploy/oauth/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/bootstrap/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
deleted file mode 100644
index e633d3a3f..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
-  <actions/>
-  <description>Migration from QUML version 0.5 to QUML version 1.0</description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_search_service_base_path</name>
-          <description>kp_search_service_base_path  http://11.2.6.6/search</description>
-          <defaultValue>http://11.2.6.6/search</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_learning_service_base_path</name>
-          <description>kp_learning_service_base_path  http://11.2.4.22:8080/learning-service</description>
-          <defaultValue>http://11.2.4.22:8080/learning-service</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_assessment_service_base_path</name>
-          <description>kp_assessment_service_base_path:  http://11.2.6.6/assessment</description>
-          <defaultValue>http://11.2.6.6/assessment</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kp_content_service_base_path</name>
-          <description>kp_content_service_base_path  http://11.2.6.6/content</description>
-          <defaultValue>http://11.2.6.6/content</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>github_release_tag</name>
-          <description>&lt;font color="red"&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/Sunbird-Ed/SunbirdEd-portal.git.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/DiscussionsMiddleware/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/DiscussionsMiddleware/config.xml
deleted file mode 100644
index b6b3651bb..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/DiscussionsMiddleware/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/KnowledgeMW</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
-          <name>private_branch</name>
-          <description/>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>DiscussionsMiddleware</projectName>
-          <projectFullName>Deploy/dev/Core/DiscussionsMiddleware</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
-          <name>branch_or_tag</name>
-          <description/>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
-
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>DiscussionsMiddleware</projectName>
-          <projectFullName>Deploy/dev/Core/DiscussionsMiddleware</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec/>
-          <upstreamProjects>ArtifactUpload/dev/Core/KnowledgeMW</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/knowledge-mw-service/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
deleted file mode 100644
index c0cd9f5f4..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/UserOrg</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>UserOrg</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>UserOrg</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/UserOrg</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/userorg/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
deleted file mode 100644
index b51ad0803..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>offlineInstaller</projectName>
-          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>offlineInstaller</projectName>
-          <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>sunbirded_installer_branch_or_tag</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbirded offline installer repo [ &lt;u&gt;https://github.com/Sunbird-Ed/sunbird-desktop-app.git&lt;/u&gt; ] for the build job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>release-2.6.0</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>offline_installer_type</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the type of installer you wanted to build&lt;/b&gt;&lt;/font&gt;</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>linux64bit</string>
-              <string>windows64bit</string>
-              <string>windows32bit</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-      <configVersion>1</configVersion>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml
deleted file mode 100644
index 5d2d3a182..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>offlinewindowstest32</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>offlinewindowstest32</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>sunbirded_installer_branch_or_tag</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbirded offline installer repo [ &lt;u&gt;https://github.com/Sunbird-Ed/sunbird-desktop-app.git&lt;/u&gt; ] for the build job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>release-2.1</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>offline_installer_type</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the type of installer you wanted to build&lt;/b&gt;&lt;/font&gt;</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>windows32bit</string>
-              <string>windows64bit</string>
-              <string>linux64bit</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml
deleted file mode 100644
index 137949d93..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>offlinewindowstest64</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.62">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.62">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>offlinewindowstest64</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>sunbirded_installer_branch_or_tag</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the branch or tag of sunbirded offline installer repo [ &lt;u&gt;https://github.com/Sunbird-Ed/sunbird-desktop-app.git&lt;/u&gt; ] for the build job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>release-2.1</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>offline_installer_type</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Choose the type of installer you wanted to build&lt;/b&gt;&lt;/font&gt;</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>windows64bit</string>
-              <string>windows32bit</string>
-              <string>linux64bit</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestionHealthCheck/config.xml
similarity index 100%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestionHealthCheck/config.xml
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSegmentHealthCheck/config.xml
similarity index 100%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSegmentHealthCheck/config.xml
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
deleted file mode 100644
index 4772e037c..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=black size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/DataPipeline/ml-workbench</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest built image will be deployed.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/DataPipeline/ml-workbench</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/deploy/ml-workbench/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
deleted file mode 100644
index c327603e7..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
-          <name>private_branch</name>
-          <description/>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Monitoring</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/Monitoring</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
-          <name>branch_or_tag</name>
-          <description/>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
-
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Monitoring</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/Monitoring</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>tag</name>
-          <description/>
-          <defaultValue/>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>kubeconfigpath</name>
-          <description/>
-          <defaultValue>/var/lib/jenkins/secrets/dp-k8s.yml</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>kubernetes/pipelines/monitoring/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InfraMonitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
similarity index 94%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InfraMonitoring/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
index 957182101..cc7259165 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InfraMonitoring/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
@@ -22,7 +22,7 @@
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>private_branch</name>
           <description></description>
-          <randomName>choice-parameter-188158799721702</randomName>
+          <randomName>choice-parameter-188192452200864</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
             <secureScript plugin="script-security@1.57">
@@ -47,12 +47,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
           <name>branch_or_tag</name>
           <description></description>
-          <randomName>choice-parameter-188158802464010</randomName>
+          <randomName>choice-parameter-188192454133057</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
             <secureScript plugin="script-security@1.57">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
@@ -116,12 +116,12 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
           <shallow>true</shallow>
           <noTags>false</noTags>
           <reference></reference>
-          <depth>1</depth>
+          <depth>0</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/deploy/monitor/DataPipeline/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/deploy/monitor/KnowledgePlatform/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
similarity index 64%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
index cef5783bf..bf385df21 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
@@ -29,14 +29,14 @@
         <hudson.model.StringParameterDefinition>
           <name>absolute_job_path</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/APIManager</defaultValue>
+          <defaultValue>ArtifactUpload/dev/KnowledgePlatform/KnowledgePlatform</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
-          <randomName>choice-parameter-9061667106947</randomName>
+          <randomName>choice-parameter-14760318274338</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
             <secureScript plugin="script-security@1.66">
@@ -51,33 +51,69 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>InternalKong</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/InternalKong</projectFullName>
+          <projectName>Search</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Search</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>option</name>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>build_number</name>
+          <description></description>
+          <randomName>choice-parameter-14760320375443</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+}
+else
+{ 
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Search</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Search</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+          <name>artifact_version</name>
           <description></description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>onboard-apis</string>
-              <string>onboard-consumers</string>
-              <string>deploy-internal-kong</string>
-              <string>provision-kong-db</string>
-              <string>bootstrap-swarm</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
+          <randomName>choice-parameter-14760322347747</randomName>
+          <visibleItemCount>1</visibleItemCount>
+          <script class="org.biouno.unochoice.model.GroovyScript">
+            <secureScript plugin="script-security@1.66">
+              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+} 
+else {
+return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+}</script>
+              <sandbox>false</sandbox>
+            </secureScript>
+            <secureFallbackScript plugin="script-security@1.66">
+              <script></script>
+              <sandbox>false</sandbox>
+            </secureFallbackScript>
+          </script>
+          <projectName>Search</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Search</projectFullName>
+          <parameters class="linked-hash-map"/>
+          <referencedParameters>artifact_source</referencedParameters>
+          <choiceType>ET_FORMATTED_HTML</choiceType>
+          <omitValueField>true</omitValueField>
+        </org.biouno.unochoice.DynamicReferenceParameter>
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>private_branch</name>
           <description></description>
@@ -97,8 +133,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>InternalKong</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/InternalKong</projectFullName>
+          <projectName>Search</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Search</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -112,7 +148,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
           <script class="org.biouno.unochoice.model.GroovyScript">
             <secureScript plugin="script-security@1.66">
               <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-data-pipeline&quot;&gt;project-sunbird/sunbird-data-pipeline&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
+return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-learning-platform&quot;&gt;project-sunbird/sunbird-learning-platform&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
 
 }
 else
@@ -124,8 +160,8 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
-          <projectName>InternalKong</projectName>
-          <projectFullName>Deploy/dev/DataPipeline/InternalKong</projectFullName>
+          <projectName>Search</projectName>
+          <projectFullName>Deploy/dev/KnowledgePlatform/Search</projectFullName>
           <parameters class="linked-hash-map"/>
           <referencedParameters></referencedParameters>
           <choiceType>ET_FORMATTED_HTML</choiceType>
@@ -143,7 +179,18 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <jenkins.triggers.ReverseBuildTrigger>
+          <spec></spec>
+          <upstreamProjects>ArtifactUpload/dev/KnowledgePlatform/KnowledgePlatform</upstreamProjects>
+          <threshold>
+            <name>SUCCESS</name>
+            <ordinal>0</ordinal>
+            <color>BLUE</color>
+            <completeBuild>true</completeBuild>
+          </threshold>
+        </jenkins.triggers.ReverseBuildTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
@@ -151,8 +198,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/ekstep/sunbird-devops.git</url>
-          <credentialsId>githubPassword</credentialsId>
+          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
@@ -172,7 +218,7 @@ return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quo
         </hudson.plugins.git.extensions.impl.CloneOption>
       </extensions>
     </scm>
-    <scriptPath>pipelines/internal-kong/Jenkinsfile</scriptPath>
+    <scriptPath>pipelines/deploy/search/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
deleted file mode 100644
index a21614a8f..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/Badger</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Badger</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/Badger</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>Badger</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/Badger</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.StringParameterDefinition>
-          <name>role_name</name>
-          <description></description>
-          <defaultValue>deploy-badger</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/Badger</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMongodb/config.xml
similarity index 100%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMongodb/config.xml
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml
index 9c9cc3c64..d9066b159 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml
@@ -43,7 +43,7 @@
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
+            <secureScript plugin="script-security@1.76">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
+            <secureFallbackScript plugin="script-security@1.76">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -69,7 +69,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
+            <secureScript plugin="script-security@1.76">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
+            <secureFallbackScript plugin="script-security@1.76">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -127,11 +127,11 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/ntp-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
deleted file mode 100644
index 86917858d..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
-  <actions>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction plugin="pipeline-model-definition@1.6.0"/>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction plugin="pipeline-model-definition@1.6.0">
-      <jobProperties/>
-      <triggers/>
-      <parameters/>
-      <options/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction>
-  </actions>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <hudson.triggers.TimerTrigger>
-          <spec>H 23 * * *</spec>
-        </hudson.triggers.TimerTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-functional-tests.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-2.10.0</name>
-        </hudson.plugins.git.BranchSpec>
-        <hudson.plugins.git.BranchSpec>
-          <name>release-3.0.0</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions/>
-    </scm>
-    <scriptPath>Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
index b6cbc95e4..7d53ae637 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
           <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
           <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.76">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.76">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -63,13 +63,13 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>branch_or_tag</name>
           <description/>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
+            <secureScript plugin="script-security@1.76">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
+            <secureFallbackScript plugin="script-security@1.76">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,12 +126,12 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/ntp-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KafkaSetup/config.xml
similarity index 100%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KafkaSetup/config.xml
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
index 0981b7800..a32fbf199 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
@@ -1,7 +1,6 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
@@ -25,51 +24,51 @@
           <defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
           <name>artifact_source</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
 ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.&lt;/b&gt;&lt;/font&gt;</description>
           <randomName>choice-parameter-9600649228560</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
+            <secureScript plugin="script-security@1.76">
               <script>return[
-&apos;JenkinsJob&apos;,
-&apos;ArtifactRepo&apos;
+'JenkinsJob',
+'ArtifactRepo'
 ]</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.76">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KeycloakMigration</projectName>
           <projectFullName>Deploy/dev/Kubernetes/KeycloakMigration</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>PT_SINGLE_SELECT</choiceType>
           <filterable>false</filterable>
           <filterLength>1</filterLength>
         </org.biouno.unochoice.CascadeChoiceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>build_number</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9600651313765</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;JenkinsJob&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;lastSuccessfulBuild&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.76">
+              <script>if (artifact_source.equals("JenkinsJob")) {
+return """&lt;input name="value" value="lastSuccessfulBuild" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
 { 
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.76">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -80,23 +79,23 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>artifact_version</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-9600653373369</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (artifact_source.equals(&quot;ArtifactRepo&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.76">
+              <script>if (artifact_source.equals("ArtifactRepo")) {
+return """&lt;input name="value" value="" class="setting-input"  type="text"&gt; &lt;br&gt; &lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;"""
 } 
 else {
-return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
+return "&lt;b&gt;Not Applicable&lt;/b&gt;"
 }</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script></script>
+            <secureFallbackScript plugin="script-security@1.76">
+              <script/>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
@@ -107,53 +106,54 @@ return &quot;&lt;b&gt;Not Applicable&lt;/b&gt;&quot;
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
           <name>private_branch</name>
-          <description></description>
+          <description/>
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
+            <secureScript plugin="script-security@1.76">
+              <script>if (override_private_branch.equals("true")) {
+return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
 else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
+            <secureFallbackScript plugin="script-security@1.76">
+              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
           </script>
           <projectName>KeycloakMigration</projectName>
           <projectFullName>Deploy/dev/Kubernetes/KeycloakMigration</projectFullName>
           <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
+          <referencedParameters/>
           <choiceType>ET_FORMATTED_HTML</choiceType>
           <omitValueField>true</omitValueField>
         </org.biouno.unochoice.DynamicReferenceParameter>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers/>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/ntp-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakRealm/config.xml
similarity index 100%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakRealm/config.xml
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
index ca962611c..541b1d523 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
@@ -43,7 +43,7 @@
           <randomName>choice-parameter-2544395024638227</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
+            <secureScript plugin="script-security@1.76">
               <script>if (override_private_branch.equals("true")) {
 return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
 }
@@ -51,7 +51,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
+            <secureFallbackScript plugin="script-security@1.76">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -69,7 +69,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <randomName>choice-parameter-2620434998790477</randomName>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.75">
+            <secureScript plugin="script-security@1.76">
               <script>if (override_public_branch.equals("true")) {
 return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
 
@@ -78,7 +78,7 @@ else
 return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureScript>
-            <secureFallbackScript plugin="script-security@1.75">
+            <secureFallbackScript plugin="script-security@1.76">
               <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
               <sandbox>false</sandbox>
             </secureFallbackScript>
@@ -101,7 +101,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -127,11 +127,11 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/ntp-devops.git</url>
+          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml
deleted file mode 100644
index bb6a46257..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/UserOrg</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>UserOrg</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/UserOrg</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.66">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.66">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>UserOrg</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/UserOrg</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>role_name</name>
-          <description></description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>sunbird-deploy</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers>
-        <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>ArtifactUpload/dev/Core/UserOrg</upstreamProjects>
-          <threshold>
-            <name>SUCCESS</name>
-            <ordinal>0</ordinal>
-            <color>BLUE</color>
-            <completeBuild>true</completeBuild>
-          </threshold>
-        </jenkins.triggers.ReverseBuildTrigger>
-      </triggers>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/redis/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/redis/config.xml
deleted file mode 100644
index 073dd5a2b..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/redis/config.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description/>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
-          <name>private_branch</name>
-          <description/>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_private_branch.equals("true")) {
-return """&lt;input name="value" value="${private_repo_branch}" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;"""
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>redis</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/redis</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
-          <name>branch_or_tag</name>
-          <description/>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.71">
-              <script>if (override_public_branch.equals("true")) {
-return """&lt;input name="value" value="" class="setting-input"  type="text"&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href="https://github.com/project-sunbird/sunbird-devops"&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;""";
-
-}
-else
-return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.71">
-              <script>return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>redis</projectName>
-          <projectFullName>Deploy/dev/Kubernetes/redis</projectFullName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters/>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>role_name</name>
-          <description/>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>chatbot</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit/>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-bot.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference/>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/redis.Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml
deleted file mode 100644
index 1cd2aa21a..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions/>
-    </scm>
-    <scriptPath>pipelines/deploy/health-check/Jenkinsfile</scriptPath>
-    <lightweight>true</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml
deleted file mode 100644
index c87f70872..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>bootstrap_user</name>
-          <description>&lt;font color=&quot;black&quot; size=2&gt;&lt;b&gt;Deployer user&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>deployer</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>bootstrap_user_public_key</name>
-          <description>&lt;font color=&quot;black&quot; size=2&gt;&lt;b&gt;Deployer user public key keep in single quotes&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>ssh_user</name>
-          <description>&lt;font color=&quot;black&quot; size=2&gt;&lt;b&gt;ops user&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ops</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>ssh_private_file</name>
-          <description>&lt;font color=&quot;black&quot; size=2&gt;&lt;b&gt;location of ssh key for ops user from &apos;/&apos;&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>ssh_public_key</name>
-          <description>&lt;font color=&quot;black&quot; size=2&gt;&lt;b&gt;ops public key&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-189737247413523</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KeyRotation</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-189737249857994</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.57">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.57">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KeyRotation</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/bootstrap/Jenkinsfile.rotatekey</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml
deleted file mode 100644
index 9e18416ad..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
-      <jobPropertyDescriptors>
-        <string>hudson.model.ParametersDefinitionProperty</string>
-        <string>com.sonyericsson.rebuild.RebuildSettings</string>
-      </jobPropertyDescriptors>
-    </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
-  </actions>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>absolute_job_path</name>
-          <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>ArtifactUpload/dev/Core/APIManager</defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>image_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
-        </hudson.model.StringParameterDefinition>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-2544395024638227</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KongMigration</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-2620434998790477</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Provide the tag or branch name to checkout the Jenkinsfile and codebase.&lt;br&gt;Note: The tag or branch name for this job should be taken from &lt;a href=&quot;https://github.com/project-sunbird/sunbird-devops&quot;&gt;project-sunbird/sunbird-devops&lt;/a&gt;&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>KongMigration</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
-    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>0</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/ops/kong-migration/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml
deleted file mode 100644
index 870f36491..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions/>
-    </scm>
-    <scriptPath>pipelines/deploy/health-check/Jenkinsfile-dp</scriptPath>
-    <lightweight>true</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisRestore/config.xml
similarity index 100%
rename from deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml
rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisRestore/config.xml
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
deleted file mode 100644
index febb94b07..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions/>
-    </scm>
-    <scriptPath>pipelines/deploy/health-check/Jenkinsfile-lp</scriptPath>
-    <lightweight>true</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml
deleted file mode 100644
index 19e29c899..000000000
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>2</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>private_branch</name>
-          <description></description>
-          <randomName>choice-parameter-196487835595646</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_private_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${private_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout a different branch from private repository.&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>keycloak-test</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-        <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
-          <name>branch_or_tag</name>
-          <description></description>
-          <randomName>choice-parameter-196487838166797</randomName>
-          <visibleItemCount>1</visibleItemCount>
-          <script class="org.biouno.unochoice.model.GroovyScript">
-            <secureScript plugin="script-security@1.58">
-              <script>if (override_public_branch.equals(&quot;true&quot;)) {
-return &quot;&quot;&quot;&lt;input name=&quot;value&quot; value=&quot;${public_repo_branch}&quot; class=&quot;setting-input&quot;  type=&quot;text&quot;&gt;&lt;br&gt; &lt;font color=dimgray size=2&gt;&lt;b&gt;Change this value to checkout Jenkinsfile from a different tag or branch.&lt;br&gt;Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.&lt;/b&gt;&lt;/font&gt;&lt;/b&gt;&lt;/font&gt;&quot;&quot;&quot;;
-}
-else
-return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureScript>
-            <secureFallbackScript plugin="script-security@1.58">
-              <script>return &quot;&quot;&quot;&lt;b&gt;This parameter is not used&lt;/b&gt;&quot;&quot;&quot;</script>
-              <sandbox>false</sandbox>
-            </secureFallbackScript>
-          </script>
-          <projectName>keycloak-test</projectName>
-          <parameters class="linked-hash-map"/>
-          <referencedParameters></referencedParameters>
-          <choiceType>ET_FORMATTED_HTML</choiceType>
-          <omitValueField>true</omitValueField>
-        </org.biouno.unochoice.DynamicReferenceParameter>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
-      <maxConcurrentPerNode>0</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
-      <throttleEnabled>false</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-  </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
-      <configVersion>2</configVersion>
-      <userRemoteConfigs>
-        <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-devops.git</url>
-        </hudson.plugins.git.UserRemoteConfig>
-      </userRemoteConfigs>
-      <branches>
-        <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}</name>
-        </hudson.plugins.git.BranchSpec>
-      </branches>
-      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-      <submoduleCfg class="list"/>
-      <extensions>
-        <hudson.plugins.git.extensions.impl.CloneOption>
-          <shallow>true</shallow>
-          <noTags>false</noTags>
-          <reference></reference>
-          <depth>1</depth>
-          <honorRefspec>false</honorRefspec>
-        </hudson.plugins.git.extensions.impl.CloneOption>
-      </extensions>
-    </scm>
-    <scriptPath>pipelines/provision/keycloak/Jenkinsfile</scriptPath>
-    <lightweight>false</lightweight>
-  </definition>
-  <triggers/>
-  <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/PostgresManaged/config.xml
similarity index 100%
rename from deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml
rename to deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/PostgresManaged/config.xml

From 92da6ce0e6015606f56d1e7520d1387bea2e5a2b Mon Sep 17 00:00:00 2001
From: keshavprasadms <keshavprasadms@gmail.com>
Date: Tue, 16 Feb 2021 19:13:00 +0530
Subject: [PATCH 173/184] fix: updated jobs

---
 deploy/jenkins/jenkins-jobs-setup.sh                 |  2 +-
 .../Core/jobs/CassandraStateValidated/config.xml     | 12 +++++++++---
 .../Build/jobs/Core/jobs/CassandraTrigger/config.xml | 12 +++++++++---
 .../jobs/Build/jobs/Core/jobs/Cert/config.xml        | 12 +++++++++---
 .../jobs/Core/jobs/CertRegistryService/config.xml    | 12 +++++++++---
 .../jobs/Build/jobs/Core/jobs/EncService/config.xml  | 12 +++++++++---
 .../Build/jobs/Core/jobs/Notification/config.xml     | 12 +++++++++---
 .../jobs/Build/jobs/Core/jobs/Proxy/config.xml       | 12 +++++++++---
 .../jobs/DataPipeline/jobs/ApiModule/config.xml      | 12 +++++++++---
 .../jobs/DataPipeline/jobs/DataReplay/config.xml     | 12 +++++++++---
 .../jobs/DataPipeline/jobs/MLWorkbench/config.xml    | 12 +++++++++---
 .../jobs/CassandraTrigger/config.xml                 | 12 +++++++++---
 12 files changed, 100 insertions(+), 34 deletions(-)

diff --git a/deploy/jenkins/jenkins-jobs-setup.sh b/deploy/jenkins/jenkins-jobs-setup.sh
index 17b6e2af5..39f73c461 100755
--- a/deploy/jenkins/jenkins-jobs-setup.sh
+++ b/deploy/jenkins/jenkins-jobs-setup.sh
@@ -23,7 +23,7 @@ setupJobs(){
       find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type f -name config.xml -exec sed -i "s#Deploy/dev/#Deploy/${arr[0]}/#g" {} \;
    fi
    find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's/<upstreamProjects>.*//g' {} \;
-   find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's/refs/heads/${public_repo_branch}/refs/tags/${public_repo_branch}/g' {} \;
+   find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's#refs/heads/${public_repo_branch}#refs/tags/${public_repo_branch}#g' {} \;
    echo -e "\e[0;33m${bold}Jobs created for ${arr[0]}${normal}"
 
    for key in "${!arr[@]}"; do
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
index 4c4a7e1b0..426db0359 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
@@ -28,9 +28,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
index 1c1e1a1ef..aa554063c 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
@@ -28,9 +28,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
         <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
           <name>public_branch</name>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
index 7827ff6cc..e1b5e9f78 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
@@ -27,9 +27,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=blue size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
index 817f91b98..5ba477720 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
@@ -27,9 +27,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=blue size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
index 09f25266f..bcd90e1d5 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
@@ -27,9 +27,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
index cd07e3de3..3d8b115a1 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
@@ -27,9 +27,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=blue size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue/>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
index f4edbda67..7bbc712cb 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
@@ -21,9 +21,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
index 8e7fd8c89..69a1b6d8b 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -28,9 +28,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
index 1861774cf..7919a6f6e 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
@@ -28,9 +28,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
index 178ee53de..48421ab9f 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -28,9 +28,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
index 541decf0a..959769db6 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
@@ -28,9 +28,15 @@
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
           <name>github_release_tag</name>
-          <description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
-          <trim>false</trim>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
+&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
+&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
+&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
+&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
+&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
+&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>

From f1d8d171a3f2f92aeeefb1de9ff5fd3c7c712134 Mon Sep 17 00:00:00 2001
From: keshavprasadms <keshavprasadms@gmail.com>
Date: Tue, 16 Feb 2021 19:28:37 +0530
Subject: [PATCH 174/184] fix: add poll scm to all builds

---
 .../jobs/Build/jobs/Core/jobs/APIManager/config.xml |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/AdminUtils/config.xml |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/Analytics/config.xml  |  7 ++++++-
 .../Build/jobs/Core/jobs/ApiManagerEcho/config.xml  |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/Assessment/config.xml |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/Bot/config.xml        |  7 ++++++-
 .../jobs/Core/jobs/CassandraDecrypt/config.xml      |  7 ++++++-
 .../Core/jobs/CassandraStateValidated/config.xml    |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/Content/config.xml    |  2 +-
 .../jobs/Build/jobs/Core/jobs/Dial/config.xml       |  2 +-
 .../jobs/Core/jobs/DiscussionsMiddleware/config.xml |  2 +-
 .../jobs/Build/jobs/Core/jobs/Groups/config.xml     |  2 +-
 .../jobs/Build/jobs/Core/jobs/Lms/config.xml        |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/Nodebb/config.xml     |  2 +-
 .../jobs/Build/jobs/Core/jobs/NodebbUI/config.xml   |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/Proxy/config.xml      |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/Report/config.xml     |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/Router/config.xml     |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/Search/config.xml     |  2 +-
 .../Core/jobs/SparkHdclusterExporter/config.xml     |  7 ++++++-
 .../jobs/Build/jobs/Core/jobs/Taxonomy/config.xml   |  2 +-
 .../DataPipeline/jobs/FlinkPipelineJobs/config.xml  |  7 ++++++-
 .../jobs/DataPipeline/jobs/MLWorkbench/config.xml   |  7 ++++++-
 .../jobs/CassandraTrigger/config.xml                |  7 ++++++-
 .../jobs/KnowledgePlatform/jobs/Dial/config.xml     |  7 ++++++-
 .../KnowledgePlatform/jobs/FlinkJobs/config.xml     |  7 ++++++-
 .../jobs/KnowledgePlatform/config.xml               |  7 ++++++-
 .../jobs/KnowledgePlatform/jobs/Neo4j/config.xml    |  7 ++++++-
 .../jobs/KnowledgePlatform/jobs/SyncTool/config.xml |  7 ++++++-
 .../jobs/KnowledgePlatform/jobs/Yarn/config.xml     | 13 ++++++++++---
 .../jobs/Plugins/jobs/CollectionEditor/config.xml   |  7 ++++++-
 .../jobs/Plugins/jobs/ContentEditor/config.xml      |  7 ++++++-
 .../jobs/Plugins/jobs/ContentPlayer/config.xml      |  7 ++++++-
 .../jobs/Plugins/jobs/ContentPlugins/config.xml     |  7 ++++++-
 .../jobs/Plugins/jobs/GenericEditor/config.xml      |  7 ++++++-
 35 files changed, 179 insertions(+), 37 deletions(-)

diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
index 2ee342e3d..9bd1f48fc 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
@@ -34,7 +34,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
index db18bdc6e..72ed08f1a 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
@@ -50,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
index acf051f3a..7953701b5 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
@@ -49,7 +49,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
index d5ae84a55..bd98b4473 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
@@ -43,7 +43,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
index b964bd126..14b4285f5 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
@@ -50,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
index cf45e95b6..d7f6011e1 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
@@ -69,7 +69,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
index d5b3e1f4d..ab2ac105c 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
@@ -60,7 +60,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
index 426db0359..c68b3746a 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
@@ -50,7 +50,12 @@
       <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
index 746733e67..7a1e023a6 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
@@ -52,7 +52,7 @@
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.SCMTrigger>
-          <spec>15 * * * *</spec>
+          <spec>H/15 * * * *</spec>
           <ignorePostCommitHooks>false</ignorePostCommitHooks>
         </hudson.triggers.SCMTrigger>
       </triggers>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
index 6bef2fdef..3038b9295 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
@@ -52,7 +52,7 @@
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.SCMTrigger>
-          <spec>15 * * * *</spec>
+          <spec>H/15 * * * *</spec>
           <ignorePostCommitHooks>false</ignorePostCommitHooks>
         </hudson.triggers.SCMTrigger>
       </triggers>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
index 9565409bf..faf8e36b7 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
@@ -52,7 +52,7 @@
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.SCMTrigger>
-          <spec>15 * * * *</spec>
+          <spec>H/15 * * * *</spec>
           <ignorePostCommitHooks>false</ignorePostCommitHooks>
         </hudson.triggers.SCMTrigger>
       </triggers>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
index 6d7f0e3b5..d79fa5227 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
@@ -52,7 +52,7 @@
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.SCMTrigger>
-          <spec>* * * * *</spec>
+          <spec>H/15 * * * *</spec>
           <ignorePostCommitHooks>false</ignorePostCommitHooks>
         </hudson.triggers.SCMTrigger>
       </triggers>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
index 19e1ed81e..765a85206 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
@@ -50,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
index ca230f61b..cca59ada5 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
@@ -51,7 +51,7 @@
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.SCMTrigger>
-          <spec>15 * * * *</spec>
+          <spec>H/15 * * * *</spec>
           <ignorePostCommitHooks>false</ignorePostCommitHooks>
         </hudson.triggers.SCMTrigger>
       </triggers>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
index 8480098b3..1a536ffea 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
@@ -43,7 +43,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
index 7bbc712cb..624380da2 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
@@ -43,7 +43,12 @@
       <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
index 9dc7e032f..d008c08f6 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
@@ -50,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
index b4bd8f3a8..5131155f8 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
@@ -69,7 +69,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
index c168a380a..5a3ed0bb1 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
@@ -52,7 +52,7 @@
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.SCMTrigger>
-          <spec>15 * * * *</spec>
+          <spec>H/15 * * * *</spec>
           <ignorePostCommitHooks>false</ignorePostCommitHooks>
         </hudson.triggers.SCMTrigger>
       </triggers>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
index 448f81e81..a97936a2d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
@@ -50,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
index bd39e7d6e..9972aa503 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
@@ -52,7 +52,7 @@
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <hudson.triggers.SCMTrigger>
-          <spec>15 * * * *</spec>
+          <spec>H/15 * * * *</spec>
           <ignorePostCommitHooks>false</ignorePostCommitHooks>
         </hudson.triggers.SCMTrigger>
       </triggers>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
index 0d0c947b8..152f01329 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -50,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
index 48421ab9f..9ae3815b7 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -50,7 +50,12 @@
       <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
index 959769db6..b9e7fb1ec 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
@@ -50,7 +50,12 @@
       <paramsToUseForLimit></paramsToUseForLimit>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
index 4b8a63492..3038b9295 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -50,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
index 4ee763736..34e5f02ee 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -50,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
index 669fd7a5f..30f4fa6fc 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
@@ -60,7 +60,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index e590a76b6..70dba202d 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -50,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
index a75d59ad4..4a50f9a9b 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
@@ -50,7 +50,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index 9d513a1ff..d8677eb0d 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -34,12 +34,12 @@
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+          <defaultValue>refs/tags/${public_repo_branch}</defaultValue>
           <trim>true</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -61,11 +61,15 @@
             <completeBuild>true</completeBuild>
           </threshold>
         </jenkins.triggers.ReverseBuildTrigger>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -77,6 +81,9 @@
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="list"/>
+      <extensions/>
     </scm>
     <scriptPath>pipelines/build/yarn/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
index abaa8251d..10addd7b8 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -43,7 +43,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
index 81102057e..e34e69463 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -43,7 +43,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
index bb4518076..15a9384cf 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -43,7 +43,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
index bb7111df4..f8c4b70a0 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -43,7 +43,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
index f86f5dd9d..26b726a42 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -43,7 +43,12 @@
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-      <triggers/>
+      <triggers>
+        <hudson.triggers.SCMTrigger>
+          <spec>H/15 * * * *</spec>
+          <ignorePostCommitHooks>false</ignorePostCommitHooks>
+        </hudson.triggers.SCMTrigger>
+      </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">

From 72216e4643e150e83ececc5e12f667a3a09c6fdc Mon Sep 17 00:00:00 2001
From: keshavprasadms <keshavprasadms@gmail.com>
Date: Tue, 16 Feb 2021 19:44:11 +0530
Subject: [PATCH 175/184] fix: sed bugs in disabling polling scm

---
 deploy/jenkins/jenkins-jobs-setup.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/jenkins/jenkins-jobs-setup.sh b/deploy/jenkins/jenkins-jobs-setup.sh
index 39f73c461..ebf024f53 100755
--- a/deploy/jenkins/jenkins-jobs-setup.sh
+++ b/deploy/jenkins/jenkins-jobs-setup.sh
@@ -22,7 +22,7 @@ setupJobs(){
       find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type f -name config.xml -exec sed -i "s#ArtifactUpload/dev/#ArtifactUpload/${arr[0]}/#g" {} \;
       find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type f -name config.xml -exec sed -i "s#Deploy/dev/#Deploy/${arr[0]}/#g" {} \;
    fi
-   find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's/<upstreamProjects>.*//g' {} \;
+   find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's#<upstreamProjects>.*##g' {} \;
    find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's#refs/heads/${public_repo_branch}#refs/tags/${public_repo_branch}#g' {} \;
    echo -e "\e[0;33m${bold}Jobs created for ${arr[0]}${normal}"
 
@@ -34,19 +34,19 @@ setupJobs(){
       cp -r $JENKINS_TMP/OpsAdministration/jobs/${arr[0]} $JENKINS_TMP/OpsAdministration/jobs/${arr[$key]}
       cp -r $JENKINS_TMP/Deploy/jobs/${arr[0]} $JENKINS_TMP/Deploy/jobs/${arr[$key]}
       find $JENKINS_TMP/Deploy/jobs/${arr[$key]} -type f -name config.xml -exec bash -c 'configPath=$0; jobPath=$(dirname $configPath); jobName=$(basename $jobPath); modulePath=${jobPath%/*/*}; moduleName=$(basename $modulePath); sed -i "s#ArtifactUpload/$1/$moduleName/.*<#Deploy/$2/$moduleName/$jobName<#g" $0' {} ${arr[0]} ${arr[$(($key - 1))]} \;
-      find $JENKINS_TMP/Deploy/jobs/${arr[$key]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's/<upstreamProjects>.*//g' {} \;
+      find $JENKINS_TMP/Deploy/jobs/${arr[$key]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's#<upstreamProjects>.*##g' {} \;
       find $JENKINS_TMP/Deploy/jobs/${arr[$key]}/jobs/Summary/jobs/DeployedVersions -type f -name config.xml -exec sed -i "s#Deploy/${arr[0]}/#Deploy/${arr[$key]}/#g" {} \;
       echo -e "\e[0;33m${bold}Jobs created for ${arr[$key]}${normal}"
    done
    echo -e "\e[0;36m${bold}Do you want to disable auto trigger of build jobs based on new commits?${normal}"
    read -p 'y/n: ' choice
    if [[ $choice == "y" ]]; then
-      find $JENKINS_TMP/Build -type f -name config.xml -exec sed -i 's/<spec>.*<\/spec>/<spec><\/spec>/g' {} \;
+      find $JENKINS_TMP/Build -type f -name config.xml -exec sed -i 's#<spec>.*</spec>#<spec></spec>#g' {} \;
    fi
    echo -e "\e[0;36m${bold}Do you want to disable daily backup jobs (Ex: DB backups)?${normal}"
    read -p 'y/n: ' choice
    if [[ $choice == "y" ]]; then
-      find $JENKINS_TMP/OpsAdministration -type f -name config.xml -exec sed -i 's/<spec>.*<\/spec>/<spec><\/spec>/g' {} \;
+      find $JENKINS_TMP/OpsAdministration -type f -name config.xml -exec sed -i 's#<spec>.*</spec>#<spec></spec>#g' {} \;
    fi
    diffs=$(colordiff -r --suppress-common-lines --no-dereference -x 'nextBuildNumber' -x 'builds' -x 'last*' /var/lib/jenkins/jobs $JENKINS_TMP | wc -l)
    if [[ $diffs -eq 0 ]]; then

From 8c77878b1bc3a6d38f2c57fcb308b128f67db82f Mon Sep 17 00:00:00 2001
From: keshavprasadms <keshavprasadms@gmail.com>
Date: Tue, 16 Feb 2021 21:24:37 +0530
Subject: [PATCH 176/184] fix: renamed job

---
 .../jobs/{Druid_Health_Check => DruidHealthCheck}/config.xml      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/{Druid_Health_Check => DruidHealthCheck}/config.xml (100%)

diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidHealthCheck/config.xml
similarity index 100%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidHealthCheck/config.xml

From a18184ab856220ff33b9a759e11f492ddde426e2 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <keshavprasadms@gmail.com>
Date: Wed, 17 Feb 2021 14:18:18 +0530
Subject: [PATCH 177/184] fix: updated texts to be compatible with older
 releases (#2256)

---
 deploy/jenkins/jenkins-jobs-setup.sh                       | 7 ++++++-
 .../jobs/Build/jobs/Core/jobs/APIManager/config.xml        | 1 -
 .../jobs/Build/jobs/Core/jobs/AdminUtils/config.xml        | 1 -
 .../jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml | 1 -
 .../jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml    | 1 -
 .../jobs/Build/jobs/Core/jobs/Assessment/config.xml        | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml    | 1 -
 .../jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml | 1 -
 .../jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml  | 1 -
 .../jobs/Core/jobs/CassandraStateValidated/config.xml      | 1 -
 .../jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml  | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml   | 1 -
 .../Build/jobs/Core/jobs/CertRegistryService/config.xml    | 1 -
 .../jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml   | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml   | 1 -
 .../Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml  | 1 -
 .../jobs/Build/jobs/Core/jobs/EncService/config.xml        | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml | 1 -
 .../jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml  | 1 -
 .../jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml  | 1 -
 .../jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml       | 1 -
 .../jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml   | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml    | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml | 1 -
 .../jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml  | 1 -
 .../jobs/Build/jobs/Core/jobs/Notification/config.xml      | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml  | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml  | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml | 1 -
 .../Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml | 1 -
 .../jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml  | 1 -
 .../jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml | 1 -
 deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml   | 1 -
 .../Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml   | 1 -
 .../jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml | 1 -
 .../Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml  | 1 -
 .../jobs/DataPipeline/jobs/AnalyticsService/config.xml     | 1 -
 .../jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml | 1 -
 .../jobs/DataPipeline/jobs/CoreDataProducts/config.xml     | 1 -
 .../Build/jobs/DataPipeline/jobs/DataPipeline/config.xml   | 1 -
 .../Build/jobs/DataPipeline/jobs/DataReplay/config.xml     | 1 -
 .../jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml   | 1 -
 .../Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml | 1 -
 .../jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml    | 1 -
 .../Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml    | 1 -
 .../jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml     | 1 -
 .../KnowledgePlatform/jobs/CassandraTrigger/config.xml     | 1 -
 .../jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml | 1 -
 .../Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml | 1 -
 .../KnowledgePlatform/jobs/KnowledgePlatform/config.xml    | 1 -
 .../Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml     | 1 -
 .../Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml  | 1 -
 .../jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml | 1 -
 .../Build/jobs/Plugins/jobs/CollectionEditor/config.xml    | 1 -
 .../jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml  | 1 -
 .../jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml  | 1 -
 .../jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml | 1 -
 .../jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml  | 1 -
 61 files changed, 6 insertions(+), 61 deletions(-)

diff --git a/deploy/jenkins/jenkins-jobs-setup.sh b/deploy/jenkins/jenkins-jobs-setup.sh
index ebf024f53..834b5e652 100755
--- a/deploy/jenkins/jenkins-jobs-setup.sh
+++ b/deploy/jenkins/jenkins-jobs-setup.sh
@@ -23,7 +23,12 @@ setupJobs(){
       find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type f -name config.xml -exec sed -i "s#Deploy/dev/#Deploy/${arr[0]}/#g" {} \;
    fi
    find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's#<upstreamProjects>.*##g' {} \;
-   find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's#refs/heads/${public_repo_branch}#refs/tags/${public_repo_branch}#g' {} \;
+   find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's#refs/heads/${public_repo_branch}##g' {} \;
+   find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's#use refs/tags/github_tag#specify the github tag#g' {} \;
+   find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's#use refs/heads/github_branch#specify the github branch#g' {} \;
+   find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i '/The default value of/d' {} \;
+   find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i '/To build from a differnt branch/d' {} \;
+
    echo -e "\e[0;33m${bold}Jobs created for ${arr[0]}${normal}"
 
    for key in "${!arr[@]}"; do
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
index 9bd1f48fc..4383f266e 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
@@ -14,7 +14,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
index 72ed08f1a..dcf74fa04 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
index 7953701b5..5bc1fe4d3 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
@@ -29,7 +29,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
index bd98b4473..9f448b2a5 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
index 14b4285f5..d2c038b5f 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
index d7f6011e1..ce5cfac72 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
index d5561a6d0..48ecbcc81 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
index ab2ac105c..6360409b1 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
index c68b3746a..06f2f4ea0 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
@@ -31,7 +31,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
index aa554063c..32304f7ab 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
@@ -31,7 +31,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
index e1b5e9f78..88e131aac 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
index 5ba477720..ef47dc9a9 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
index 7a1e023a6..7b47e1972 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
index 3038b9295..81f62c3fb 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
index faf8e36b7..dfdc502b8 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
index bcd90e1d5..d49f350a8 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
index d79fa5227..9e67e22b9 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
index 6c28e412b..ac673ecdd 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
index 1609b070d..48ed8d59f 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
index aef65a707..6523b7b62 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
index 3e305126d..2cdac260a 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
index 765a85206..89116c840 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
index cca59ada5..bbe33dacb 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
index 1a536ffea..2f090a4c1 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
index 3d8b115a1..91d5a612f 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
index 6676f6440..1e29cff89 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
index d6893e327..48da6a502 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
index 624380da2..d595a2ad0 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
@@ -24,7 +24,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
index d008c08f6..ff518db7c 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
index 5131155f8..1511d6930 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
index 5a3ed0bb1..f5aebc563 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
index a97936a2d..03968468a 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
index 9972aa503..3bcf74d9b 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
index c255cd31c..0eeefa3a6 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
index 479628163..73cc32f02 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
index bdfdb2488..943ea3826 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
index f3cfe2e3c..e6a0502a9 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
index ca5c9e3d6..2b9e72c45 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
index db20774b4..d38675727 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
index 69a1b6d8b..07a30b3ff 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -31,7 +31,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
index 1b26e4a40..a458418b2 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
index dd7e2ea0e..62906b155 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
index 7919a6f6e..6b70a3a5a 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
@@ -31,7 +31,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
index e7a2a57d3..197e507a7 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
@@ -14,7 +14,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
index f98360f2d..6a5415e44 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
index 152f01329..8d7aacf70 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
index 9ae3815b7..d3833e584 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -31,7 +31,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
index 086918d9b..83a55b40e 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
index b9e7fb1ec..94f6e4be2 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
@@ -31,7 +31,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
index 3038b9295..81f62c3fb 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
index 34e5f02ee..11f30a0d3 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
index 30f4fa6fc..3fbdaecda 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index 70dba202d..c77b00f76 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
index 4a50f9a9b..fb25d449a 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index d8677eb0d..e4ff68b85 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -30,7 +30,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
index 10addd7b8..5e64cccbc 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
index e34e69463..03169e685 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
index 15a9384cf..7c4d30358 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
index f8c4b70a0..72d5fd8f4 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
index 26b726a42..9437b8160 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -23,7 +23,6 @@
           <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
 &lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
 &lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
-&lt;li&gt;Usually this input does not require any changes, unless you want to build from a differnt branch / tag&lt;/li&gt;
 &lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
 &lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
 &lt;/b&gt;&lt;/font&gt;</description>

From d2382ec236ba59f1c1fa0be0d1a8a586f19888a6 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <keshavprasadms@gmail.com>
Date: Thu, 18 Feb 2021 15:18:12 +0530
Subject: [PATCH 178/184] Revert "fix: updating ansible verison to 2.7.18
 (#2187)" (#2262)

This reverts commit 49f7c0c4a3b366051ea9cd321d206194c86ed123.
---
 deploy/jenkins/jenkins-server-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh
index e888fb818..7ea5b17cd 100755
--- a/deploy/jenkins/jenkins-server-setup.sh
+++ b/deploy/jenkins/jenkins-server-setup.sh
@@ -66,7 +66,7 @@ ln -s /usr/local/lib/node-v6.17.1-linux-x64/bin/gulp /usr/bin/gulp
 rm -rf node-v6.17.1-linux-x64*
 
 echo -e "\n\e[0;32m${bold}Installating Ansible${normal}"
-pip install ansible==2.7.18
+pip install ansible==2.5.2
 
 echo -e "\n\e[0;32m${bold}Installating azure cli${normal}"
 apt-get install ca-certificates curl apt-transport-https lsb-release gnupg

From 91b9272011215aa6facda96d440e5d475555f7ce Mon Sep 17 00:00:00 2001
From: kaliraja <34502260+Kaali09@users.noreply.github.com>
Date: Fri, 19 Mar 2021 15:25:41 +0530
Subject: [PATCH 179/184] added the service endpoints monitoring feature.
 (#2200)

* Issue #TG-828 : added the json exporter chart

* Issue #TG-828 : added the json exporter chart

* Issue #TG-828 : added the json exporter chart

* Issue #TG-828 : added the missing vars

* Issue #TG-828 : added the missing vars

* Issue #TG-828 : added the missing vars

* Issue #TG-828 : added the missing vars

* Issue #TG-828 : added the prom configuration

* Issue #TG-828 : added the prom configuration

* Issue #TG-828 : added the prom configuration

* Issue #TG-828 : added the alert rules

* Issue #TG-828 : corrected the prom config

* Issue #TG-828 : corrected the prom config

* Issue #TG-828 : corrected the prom config

* Issue #TG-828 : added the ansible loop

* Issue #TG-828 : corrected the indentation error

* Issue #TG-828 : corrected the file name

* Issue #TG-828: removed unnecessary vars

* Issue #TG-828: worked on the pr comments

* Issue #TG-828: emhanced the scripts

* Issue #TG-828: emhanced the scripts

* Issue #TG-828: corrected the indentation error
---
 .../sunbird-monitoring/defaults/main.yml      | 19 ++++-
 .../templates/additional-scrape-configs.yaml  | 22 +++++-
 .../templates/alertrules.yaml                 |  3 +
 .../templates/json-path-exporter.yaml         |  1 +
 .../templates/promrulesServiceHealthCheck.yml | 24 +++++++
 .../monitoring/json-path-exporter/.helmignore | 22 ++++++
 .../monitoring/json-path-exporter/Chart.yaml  | 21 ++++++
 .../json-path-exporter/templates/NOTES.txt    | 21 ++++++
 .../json-path-exporter/templates/_helpers.tpl | 63 +++++++++++++++++
 .../templates/configmap.yaml                  | 28 ++++++++
 .../templates/deployment.yaml                 | 42 +++++++++++
 .../json-path-exporter/templates/service.yaml | 15 ++++
 .../templates/serviceMonitor.yaml             | 21 ++++++
 .../monitoring/json-path-exporter/values.yaml | 69 +++++++++++++++++++
 14 files changed, 369 insertions(+), 2 deletions(-)
 create mode 100644 kubernetes/ansible/roles/sunbird-monitoring/templates/json-path-exporter.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/alertrules/templates/promrulesServiceHealthCheck.yml
 create mode 100644 kubernetes/helm_charts/monitoring/json-path-exporter/.helmignore
 create mode 100644 kubernetes/helm_charts/monitoring/json-path-exporter/Chart.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/json-path-exporter/templates/NOTES.txt
 create mode 100644 kubernetes/helm_charts/monitoring/json-path-exporter/templates/_helpers.tpl
 create mode 100644 kubernetes/helm_charts/monitoring/json-path-exporter/templates/configmap.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/json-path-exporter/templates/deployment.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/json-path-exporter/templates/service.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/json-path-exporter/templates/serviceMonitor.yaml
 create mode 100644 kubernetes/helm_charts/monitoring/json-path-exporter/values.yaml

diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
index 211cf8802..316d8421d 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
@@ -12,7 +12,7 @@ monitoring_stack:
   - kafka-topic-exporter
   - prometheus-redis-exporter
   - processing-kafka-exporter
-  - azure-ambari-prometheus-exporter
+  - json-path-exporter
 
 namespace: monitoring
 
@@ -215,3 +215,20 @@ redis_process_names: ""
 vault_azure_spark_cluster_http_password: ""
 azure_spark_cluster_http_password: "{{ vault_azure_spark_cluster_http_password }}"
 
+service_health_checks:
+  - service_name: 'analytics'
+    targets: "http://analytics-service.{{ namespace }}.svc.cluster.local:9000/health"
+  - service_name: 'learning-service'
+    targets: "http://{{ learningservice_ip }}:8080/learning-service/healthy"
+  - service_name: 'player'
+    targets: "http://player.{{ namespace }}.svc.cluster.local:3000/health"
+  - service_name: 'search'
+    targets: "http://search-service.{{ namespace }}.svc.cluster.local:9000/health"
+  - service_name: 'knowledgemw'
+    targets: "http://knowledge-mw-service.{{ namespace }}.svc.cluster.local:5000/health"
+  - service_name: 'content'
+    targets: "http://content-service.{{ namespace }}.svc.cluster.local:9000/health"
+  - service_name: 'lms'
+    targets: "http://lms-service.{{ namespace }}.svc.cluster.local:9000/health"
+  - service_name: 'learner'
+    targets: "http://learner-service.{{ namespace }}.svc.cluster.local:9000/health"
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml
index e5eb3a5c7..f380c98d2 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml
@@ -97,4 +97,24 @@ scrapeconfig:
         target_label: instance
       - target_label: __address__
         replacement: blackbox-exporter-prometheus-blackbox-exporter:9115
-  {% endfor %}
+        {% endfor %}
+
+  {% for item in service_health_checks %}
+  # This empty line ensures indentation is correct after ansible jinja2 template is materialized
+  - job_name: 'availability_service_{{ item.service_name }}'
+    metrics_path: /probe
+    params:
+      jsonpath: [$.result]
+    static_configs:
+    - targets:
+        - {{ item.targets }}
+      labels:
+        "service_name": "{{ item.service_name }}"
+    relabel_configs:
+      - source_labels: [__address__]
+        target_label: __param_target
+      - source_labels: [__param_target]
+        target_label: instance
+      - target_label: __address__
+        replacement: json-path-exporter.monitoring.svc.cluster.local:7979
+        {% endfor %}
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
index ed09e111c..ba74c9e9b 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/alertrules.yaml
@@ -84,3 +84,6 @@ secor_process_names:
 
 redis_process_names:
   {{ redis_process_names | to_yaml | indent( width=2) }}
+
+service_health_checks:
+  {{ service_health_checks | to_yaml | indent( width=2) }}
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/templates/json-path-exporter.yaml b/kubernetes/ansible/roles/sunbird-monitoring/templates/json-path-exporter.yaml
new file mode 100644
index 000000000..a166d50c1
--- /dev/null
+++ b/kubernetes/ansible/roles/sunbird-monitoring/templates/json-path-exporter.yaml
@@ -0,0 +1 @@
+env: {{ env }}
diff --git a/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesServiceHealthCheck.yml b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesServiceHealthCheck.yml
new file mode 100644
index 000000000..2e4396139
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/alertrules/templates/promrulesServiceHealthCheck.yml
@@ -0,0 +1,24 @@
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    role: alert-rules
+    app: {{ .Values.prometheus_rule_selector_app }} 
+    release: {{ .Values.prometheus_rule_selector_release }} 
+  name: service-healthcheck-alertrules
+  namespace: {{ .Values.namespace }} 
+spec:
+  groups:
+  - name: alertrules.service.healthcheck
+    rules:
+    {{ range $key := .Values.service_health_checks }}
+    - alert: ServiceHealthCheck Failed
+      expr: service_health_status{service_name={{ .service_name | quote }}} == 0
+      for: 5m
+      labels:
+        severity: critical
+      annotations:
+        message: The {{ .service_name }} service overall healthcheck is failing. Please check.
+        summary: The {{ .service_name }} service overall healthcheck is failing. Please check.
+    {{- end }}
diff --git a/kubernetes/helm_charts/monitoring/json-path-exporter/.helmignore b/kubernetes/helm_charts/monitoring/json-path-exporter/.helmignore
new file mode 100644
index 000000000..50af03172
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/json-path-exporter/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/kubernetes/helm_charts/monitoring/json-path-exporter/Chart.yaml b/kubernetes/helm_charts/monitoring/json-path-exporter/Chart.yaml
new file mode 100644
index 000000000..4fc1f011a
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/json-path-exporter/Chart.yaml
@@ -0,0 +1,21 @@
+apiVersion: v2
+name: json-path-exporter
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application.
+appVersion: 1.16.0
diff --git a/kubernetes/helm_charts/monitoring/json-path-exporter/templates/NOTES.txt b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/NOTES.txt
new file mode 100644
index 000000000..cf9e3fc0c
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/NOTES.txt
@@ -0,0 +1,21 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "json-path-exporter.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "json-path-exporter.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "json-path-exporter.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "json-path-exporter.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}
diff --git a/kubernetes/helm_charts/monitoring/json-path-exporter/templates/_helpers.tpl b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/_helpers.tpl
new file mode 100644
index 000000000..8c869b2a5
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/_helpers.tpl
@@ -0,0 +1,63 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "json-path-exporter.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "json-path-exporter.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "json-path-exporter.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "json-path-exporter.labels" -}}
+helm.sh/chart: {{ include "json-path-exporter.chart" . }}
+{{ include "json-path-exporter.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "json-path-exporter.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "json-path-exporter.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "json-path-exporter.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "json-path-exporter.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
diff --git a/kubernetes/helm_charts/monitoring/json-path-exporter/templates/configmap.yaml b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/configmap.yaml
new file mode 100644
index 000000000..0054f7225
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/configmap.yaml
@@ -0,0 +1,28 @@
+apiVersion: v1
+data:
+  config.yml: |
+    ---
+    metrics:
+    - name: service_health
+      type: object
+      help: Example of sub-level value scrapes from a json
+      path: $.result
+      labels:
+        environment: {{ .Values.env }} # static label
+        service: dummy-service  # dynamic label
+      values:
+        status: $.healthy
+    - name: service_health
+      type: object
+      help: Example of sub-level value scrapes from a json
+      path: $.result
+      labels:
+        environment: {{ .Values.env }} # static label
+        service: dummy-service  # dynamic label
+      values:
+        status: $.response.healthy
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: {{ .Chart.Name }}-config
+  namespace: monitoring
diff --git a/kubernetes/helm_charts/monitoring/json-path-exporter/templates/deployment.yaml b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/deployment.yaml
new file mode 100644
index 000000000..fa8571bd8
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/deployment.yaml
@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "json-path-exporter.fullname" . }}
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+  labels:
+    {{- include "json-path-exporter.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "json-path-exporter.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "json-path-exporter.selectorLabels" . | nindent 8 }}
+    spec:
+      volumes:
+        - name: json-exporter-config-volume
+          configMap:
+            name: {{ .Release.Name }}-config
+    {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          args:
+            - --config.file=/config.yml
+          ports:
+            - name: http
+              containerPort: 7979
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+          - name: json-exporter-config-volume
+            mountPath: /config.yml
+            subPath: config.yml
+ 
diff --git a/kubernetes/helm_charts/monitoring/json-path-exporter/templates/service.yaml b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/service.yaml
new file mode 100644
index 000000000..4aae2c03e
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "json-path-exporter.fullname" . }}
+  labels:
+    {{- include "json-path-exporter.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: metrics
+  selector:
+    {{- include "json-path-exporter.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm_charts/monitoring/json-path-exporter/templates/serviceMonitor.yaml b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/serviceMonitor.yaml
new file mode 100644
index 000000000..8d0c91dc1
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/json-path-exporter/templates/serviceMonitor.yaml
@@ -0,0 +1,21 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    {{- include "json-path-exporter.labels" . | nindent 6 }}
+    {{ toYaml .Values.serviceMonitorLabels | nindent 6 }}
+  name: {{ include "json-path-exporter.fullname" . }}
+  namespace: {{ default .Values.namespace .Release.Namespace  }}
+spec:
+  endpoints:
+  - honorLabels: true
+    port: metrics
+    relabelings:
+    - action: labeldrop
+      regex: ^pod$
+  namespaceSelector:
+    matchNames:
+    - monitoring
+  selector:
+    matchLabels:
+    {{- include "json-path-exporter.labels" . | nindent 6 }}
diff --git a/kubernetes/helm_charts/monitoring/json-path-exporter/values.yaml b/kubernetes/helm_charts/monitoring/json-path-exporter/values.yaml
new file mode 100644
index 000000000..8b39c08fe
--- /dev/null
+++ b/kubernetes/helm_charts/monitoring/json-path-exporter/values.yaml
@@ -0,0 +1,69 @@
+# Default values for json-path-exporter.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: quay.io/prometheuscommunity/json-exporter:latest
+  pullPolicy: IfNotPresent
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name:
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 7979
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths: []
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+serviceMonitorLabels:
+  release: prometheus-operator

From dca8d0b2a28c9f628e25d8f4c90859a315a4b491 Mon Sep 17 00:00:00 2001
From: "haridas.kakunje" <haridas.kakunje@tarento.com>
Date: Sat, 24 Apr 2021 00:41:53 +0530
Subject: [PATCH 180/184] MAX_CONTENT_PACKAGE_FILE_SIZE_LIMIT updated

---
 .../stack-sunbird/templates/content-service_application.conf  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index 86ea4f2a9..9865c55c2 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -397,10 +397,10 @@ redis {
 
 
 #--Maximum Content Package File Size Limit in Bytes (50 MB)
-MAX_CONTENT_PACKAGE_FILE_SIZE_LIMIT=52428800
+MAX_CONTENT_PACKAGE_FILE_SIZE_LIMIT=200000000
 
 #--Maximum Asset File Size Limit in Bytes (50 MB)
-MAX_ASSET_FILE_SIZE_LIMIT=52428800
+MAX_ASSET_FILE_SIZE_LIMIT=200000000
 
 #--No of Retry While File Download Fails
 RETRY_ASSET_DOWNLOAD_COUNT=1

From bec2c431c1f8177fd99079ece666276b1f859529 Mon Sep 17 00:00:00 2001
From: "haridas.kakunje" <haridas.kakunje@tarento.com>
Date: Sat, 24 Apr 2021 02:32:38 +0530
Subject: [PATCH 181/184] upload limie changed to 400m

---
 .../templates/content-service_application.conf       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index 9865c55c2..4b6464550 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -211,8 +211,8 @@ play.http {
 }
 
 play.server.http.idleTimeout = 60s
-play.http.parser.maxDiskBuffer = 100MB
-parsers.anyContent.maxLength = 100MB
+play.http.parser.maxDiskBuffer = 400MB
+parsers.anyContent.maxLength = 400MB
 
 ## Netty Provider
 # https://www.playframework.com/documentation/latest/SettingsNetty
@@ -339,8 +339,8 @@ play.filters {
   }
 }
 
-play.http.parser.maxMemoryBuffer = 50MB
-akka.http.parsing.max-content-length = 50MB
+play.http.parser.maxMemoryBuffer = 400MB
+akka.http.parsing.max-content-length = 400MB
 schema.base_path="{{kp_schema_base_path | default('/home/sunbird/content-service-1.0-SNAPSHOT/schemas')}}"
 
 # Cassandra Configuration
@@ -397,10 +397,10 @@ redis {
 
 
 #--Maximum Content Package File Size Limit in Bytes (50 MB)
-MAX_CONTENT_PACKAGE_FILE_SIZE_LIMIT=200000000
+MAX_CONTENT_PACKAGE_FILE_SIZE_LIMIT=400000000
 
 #--Maximum Asset File Size Limit in Bytes (50 MB)
-MAX_ASSET_FILE_SIZE_LIMIT=200000000
+MAX_ASSET_FILE_SIZE_LIMIT=400000000
 
 #--No of Retry While File Download Fails
 RETRY_ASSET_DOWNLOAD_COUNT=1

From fba596fa0c62f79abe4c2d31231950fc9d6c8932 Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Thu, 22 Jul 2021 18:43:56 +0530
Subject: [PATCH 182/184] Update content-service_application.conf

---
 .../stack-sunbird/templates/content-service_application.conf     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index 4b6464550..7acca1162 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -14,6 +14,7 @@
 # And if an environment variable exists when there is no other substitution, then
 # HOCON will fall back to substituting environment variable:
 #mykey = ${JAVA_HOME}
+indexHtmlValidation.env=false
 
 ## Akka
 # https://www.playframework.com/documentation/latest/ScalaAkka#Configuration

From 433aa310dda806ac935c2ec09920c382869937ba Mon Sep 17 00:00:00 2001
From: pritha-tarento <42533384+pritha-tarento@users.noreply.github.com>
Date: Tue, 17 Aug 2021 13:32:12 +0530
Subject: [PATCH 183/184] Update main.yml

---
 ansible/roles/kong-api/defaults/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index e16f9ea64..34b745446 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -31,6 +31,7 @@ premium_consumer_large_rate_limit_per_hour: 100000
 small_request_size_limit: 1
 medium_request_size_limit: 10
 large_request_size_limit: 100
+x_large_request_size_limit: 400
 
 # External URL's
 freshDesk_url: "http://dummy.freshDesk.url"
@@ -1978,7 +1979,7 @@ kong_apis:
       config.hour: "{{ medium_rate_limit_per_hour }}"
       config.limit_by: credential
     - name: request-size-limiting
-      config.allowed_payload_size: "{{ small_request_size_limit }}"
+      config.allowed_payload_size: "{{ x_large_request_size_limit }}"
 
   - name: PrivateContentReviewAPI
     uris: "{{ private_content_prefix }}/v3/review"

From 2b83304d9fed1f51960f10f4a07e8225f62b2fa5 Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Thu, 9 Sep 2021 10:08:34 +0530
Subject: [PATCH 184/184] Update content-service_application.conf

---
 .../stack-sunbird/templates/content-service_application.conf     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
index 7acca1162..061e9a748 100644
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -536,6 +536,7 @@ contentTypeToPrimaryCategory {
   CourseUnit: "Course Unit"
   TextBookUnit: "Textbook Unit"
   Asset: "Certificate Template"
+  Program: "Program"
 }
 
 resourceTypeToPrimaryCategory {